test
test
Merge branch 'master' into mirko_gpstest

Conflicts:
	Day/bin/R.txt
	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$menu.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/activities/MainActivity.class
	Day/bin/classes/de/smbsolutions/day/presentation/activities/MapActivity.class
	Day/gen/de/smbsolutions/day/R.java