ListView Zähler Wasser
Merge branch 'master' of https://github.com/TobiasNeuburger/myFlat

Conflicts:
	myFlat/AndroidManifest.xml
	myFlat/bin/AndroidManifest.xml
	myFlat/bin/classes/com/example/myflat/Dashboard.class
	myFlat/bin/classes/com/example/myflat/Detail.class
	myFlat/bin/classes/com/example/myflat/Login.class
	myFlat/bin/classes/com/example/myflat/R$attr.class
	myFlat/bin/classes/com/example/myflat/R$dimen.class
	myFlat/bin/classes/com/example/myflat/R$drawable.class
	myFlat/bin/classes/com/example/myflat/R$id.class
	myFlat/bin/classes/com/example/myflat/R$layout.class
	myFlat/bin/classes/com/example/myflat/R$menu.class
	myFlat/bin/classes/com/example/myflat/R$string.class
	myFlat/bin/classes/com/example/myflat/R$style.class
	myFlat/bin/classes/com/example/myflat/R$styleable.class
	myFlat/bin/classes/com/example/myflat/R.class
	myFlat/bin/classes/com/example/myflat/Register.class
	myFlat/gen/com/example/myflat/R.java