merge
Merge branch 'master' of https://github.com/mehlius/KOMA.git

Conflicts:
	KomaProjekt/src/com/koma/gameapp/ui/highscoreListAdapter.java
working Score, changed several UI Elements