Merge origin/Update002

Conflicts:
	build.gradle
Merge origin/Update002

Conflicts:
	build.gradle
Merge origin/master

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

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