small changes
Merge branch 'master' of
https://github.com/SeriousMonkeySoftworks/Sillgasse.git

Conflicts:
	sillgasse/bin/classes/com/seriousmonkey/sillgasse/R$id.class
	sillgasse/gen/com/seriousmonkey/sillgasse/R.java