Merge origin/master

Conflicts:
	src/com/nuliy/example/AI.java
	src/com/nuliy/example/GameScreen.java
	src/com/nuliy/example/Pedestrian.java
	src/com/nuliy/example/Player.java
Merge origin/master

Conflicts:
	src/com/nuliy/example/AI.java
	src/com/nuliy/example/GameScreen.java
	src/com/nuliy/example/Pedestrian.java
	src/com/nuliy/example/Player.java
Merge origin/DeadBodyUpdate2

Conflicts:
	src/com/nuliy/example/AI.java
	src/com/nuliy/example/DeadPed.java
	src/com/nuliy/example/GameScreen.java
Merge origin/DeadBodyUpdate2

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