ffff
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$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/presentation/fragments/settings/GPSFragment.class
	Day/bin/resources.ap_
	Day/res/layout/fragment_detail.xml
	Day/res/layout/fragment_picture.xml