Test

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

Conflicts:
	myFlat/bin/classes.dex

myFlat/bin/classes/com/example/myflat/DetailElectro$SaveZaehlerWater.cla
ss
	myFlat/bin/classes/com/example/myflat/DetailElectro.class
	myFlat/bin/classes/com/example/myflat/ShowZaehlerElectro.class
	myFlat/bin/myFlat.apk
	myFlat/bin/resources.ap_
	myFlat/src/com/example/myflat/DetailElectro.java