update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/logic/GameManager.java
update
Merge remote-tracking branch 'origin/master'