Merge branch 'next-setaylor' of https://github.com/blackberry-gaming/GamePlay into next-setaylor

Conflicts:
	gameplay-newproject.bat
	gameplay-template/gameplay-template-macos.plist
	gameplay-template/gameplay-template.xcodeproj/project.pbxproj