Merge origin/master

Conflicts:
	src/harusame/core/view/GameOverScreen.java