1551 1
develop 1
1551 2
Merge branch 'develop1551' into develop

Conflicts:
	demo/src/player/PlayerActivity.java
develop2
"hjsfhd"