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

Conflicts:
	myFlat/bin/classes.dex

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/Host.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/bin/dexedLibs/android-support-v4-192d0d76c068787b583d9a5cdeca0228
.jar

myFlat/bin/dexedLibs/android-support-v7-gridlayout-a123123f2feed75b69024
9ff1f411fc1.jar
	myFlat/bin/dexedLibs/gridlayout_v7-189ba752181628ec2e1dea51eb8b03fc.jar
	myFlat/bin/myFlat.apk
	myFlat/bin/resources.ap_
	myFlat/gen/com/example/myflat/R.java
	myFlat/src/com/example/myflat/Host.java