Merge origin/master

Conflicts:
	src/GAME/Game.java
Merge origin/master