commit
Merge branch 'master' of https://github.com/TobiasNeuburger/myFlat

Conflicts:
	myFlat/bin/classes.dex
	myFlat/bin/myFlat.apk