pplpl
222
6262
Merge branch 'master' of https://github.com/mirkohin1991/day.git

Conflicts:
	Day/bin/Day.apk
	Day/bin/classes.dex
	Day/bin/classes/de/smbsolutions/day/presentation/activities/MainActivity.class
hhgukz
Merge branch 'master' of https://github.com/mirkohin1991/day.git

Conflicts:
	Day/bin/Day.apk
	Day/bin/classes.dex
	Day/bin/classes/de/smbsolutions/day/R$string.class
	Day/bin/classes/de/smbsolutions/day/R$style.class
	Day/bin/classes/de/smbsolutions/day/R$styleable.class
	Day/bin/classes/de/smbsolutions/day/presentation/activities/MainActivity.class
	Day/bin/dexedLibs/android-support-v4-b5b9c102dae94c7e9df5460c7ac59620.jar
	Day/bin/dexedLibs/google-play-services-eca3b304956e15cb65da3ed13cbe4bf5.jar
	Day/bin/dexedLibs/google-play-services_lib-4d9aa74d765057c71e6482269ff313f7.jar
	Day/bin/dexedLibs/google-play-services_lib-ac9bc39ae1fabb0378c28723cffa7dc5.jar
	Day/bin/resources.ap_
5461