Merge origin/master

Conflicts:
	src/java/entities/UserPlay.java
Merge origin/master
Merge origin/master

Conflicts:
	src/java/entities/UserPlay.java