Detail Changes, Border not editable
Merge branch 'master' of https://github.com/TobiasNeuburger/myFlat

Conflicts:
	myFlat/bin/myFlat.apk
	myFlat/bin/resources.ap_