r5hesutrz5s
8089
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
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$1.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$2.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$3.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$4.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$5.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$6.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$7.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment$8.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$1.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$2.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$3.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$4.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$5.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$6.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment$7.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment.class
	Day/bin/resources.ap_
	Day/src/de/smbsolutions/day/presentation/activities/MainActivity.java
	Day/src/de/smbsolutions/day/presentation/fragments/MainFragment.java
sqsqsq
qsqsqsqs
Merge branch 'master' of https://github.com/mirkohin1991/day.git

Conflicts:
	Day/bin/classes/de/smbsolutions/day/R$drawable.class
	Day/bin/classes/de/smbsolutions/day/R$id.class
	Day/bin/classes/de/smbsolutions/day/R$integer.class
	Day/bin/classes/de/smbsolutions/day/R$layout.class
	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/functions/objects/Route.class
	Day/bin/classes/de/smbsolutions/day/presentation/activities/MainActivity.class
	Day/src/de/smbsolutions/day/functions/interfaces/MainCallback.java