Game over fixed
camera fixed
Merge remote-tracking branch 'origin/Android' into Android

Conflicts:
	build.gradle