committing old stuff in order to get Rony's new commits.
GOD BLESS YOUR SOUL.
Merge branch 'Maze' of https://github.com/ronlut/BooYa into Maze

Conflicts:
	BooYa/src/com/example/booya/MazeGameActivity.java
	BooYa/src/com/example/booya/video/recording/RecorderService.java