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

Conflicts:
	KomaProjekt/bin/KomaProjekt.apk
	KomaProjekt/bin/classes.dex
Merge branch 'master' of https://github.com/mehlius/KOMA.git
Performance optimization for col detection