Merge branch 'feature/camera_in_game_intergration' into develop

Conflicts:
	BooYa/src/com/example/booya/MazeGameActivity.java
Merge branch 'develop' of github.com:ronlut/BooYa into develop

Conflicts:
	BooYa/src/com/example/booya/MazeGameActivity.java