Merge remote-tracking branch 'blackberry/next' into gesture_events

Conflicts:
	gameplay/src/Game.h