Merge origin/master

Conflicts:
	src/com/nuliy/example/GameScreen.java