iuui
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/functions/database/Database.class
	Day/bin/classes/de/smbsolutions/day/functions/interfaces/MainCallback.class
	Day/bin/classes/de/smbsolutions/day/functions/objects/Route.class
	Day/bin/classes/de/smbsolutions/day/presentation/activities/MainActivity.class
	Day/bin/classes/de/smbsolutions/day/presentation/dialogs/RouteNameDialog$1.class
	Day/bin/classes/de/smbsolutions/day/presentation/dialogs/RouteNameDialog$2.class
	Day/bin/classes/de/smbsolutions/day/presentation/dialogs/RouteNameDialog.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.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$8.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/MainFragment.class
	Day/bin/resources.ap_
	Day/src/de/smbsolutions/day/functions/database/Database.java
	Day/src/de/smbsolutions/day/functions/objects/Route.java
	Day/src/de/smbsolutions/day/presentation/activities/MainActivity.java
	Day/src/de/smbsolutions/day/presentation/dialogs/RouteNameDialog.java
	Day/src/de/smbsolutions/day/presentation/fragments/DetailFragment.java
	Day/src/de/smbsolutions/day/presentation/fragments/MainFragment.java
fxtnsjr