ffffff
Merge branch 'master' of https://github.com/mirkohin1991/day.git

Conflicts:
	Day/bin/Day.apk
	Day/bin/classes.dex
	Day/bin/resources.ap_
	Day/src/de/smbsolutions/day/functions/database/DatabaseManager.java