.
Merge branch 'master' of https://github.com/Kemiren/HerbertAdventure.git
.
Merge branch 'master' of https://github.com/Kemiren/HerbertAdventure.git

Conflicts:
	SMIMS 2013 Adventure/src/de/herbert/view/View.java