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

Conflicts:

myFlat/bin/classes/com/example/myflat/DetailElectro$DatePickerFragment.c
lass
	myFlat/bin/classes/com/example/myflat/DetailElectro.class

myFlat/bin/classes/com/example/myflat/DetailGas$DatePickerFragment.class
	myFlat/bin/classes/com/example/myflat/DetailGas.class

myFlat/bin/classes/com/example/myflat/DetailWater$DatePickerFragment.cla
ss
	myFlat/bin/classes/com/example/myflat/DetailWater.class
	myFlat/bin/classes/com/example/myflat/Login$2.class
	myFlat/bin/classes/com/example/myflat/Login.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/Register$2.class
	myFlat/bin/classes/com/example/myflat/Register.class
	myFlat/bin/classes/com/example/myflat/Settings$1.class
	myFlat/bin/classes/com/example/myflat/Settings.class
	myFlat/bin/classes/com/example/myflat/ShowZaehlerElectro.class
	myFlat/bin/classes/com/example/myflat/ShowZaehlerGas.class
	myFlat/bin/classes/com/example/myflat/ShowZaehlerWater.class
	myFlat/gen/com/example/myflat/R.java