Merge origin/master

Conflicts:
	src/java/zole/Player.java
Merge origin/master

Conflicts:
	src/java/zole/Player.java
Merge origin/master