commit before pull
Merge branch 'master' of https://github.com/mehlius/KOMA.git

Conflicts:
	KomaProjekt/gen/com/koma/gameapp/ui/R.java
Merge branch 'master' of https://github.com/mehlius/KOMA.git
comments