bugFix
Merge branch 'master' of https://github.com/Warrows/GGJ2014-BuchBuchTeam

Conflicts:
	src/com/buchbuchteam/buchbuch/view/GameScreen.java