Merge origin/master

Conflicts:
	src/com/nuliy/example/GameScreen.java
Merge origin/Car

Conflicts:
	src/com/nuliy/example/Assets.java
	src/com/nuliy/example/GameScreen.java
Merge origin/PlayerUpdate