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

Conflicts:
	Day/AndroidManifest.xml
	Day/bin/AndroidManifest.xml
	Day/bin/Day.apk
	Day/bin/R.txt
	Day/bin/classes.dex
	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/functions/objects/SliderMenu$1.class
	Day/bin/classes/de/smbsolutions/day/functions/objects/SliderMenu$SlideMenuClickListener.class
	Day/bin/classes/de/smbsolutions/day/functions/objects/SliderMenu.class
	Day/bin/classes/de/smbsolutions/day/functions/tasks/MarkerWorkerTask$1.class
	Day/bin/classes/de/smbsolutions/day/presentation/activities/MainActivity.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/DetailFragment.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/settings/CameraFragment.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/settings/FacebookFragment.class
	Day/bin/classes/de/smbsolutions/day/presentation/fragments/settings/GPSFragment.class
	Day/bin/classes/de/smbsolutions/day/presentation/listviews/SliderMenuListAdapter.class
	Day/bin/resources.ap_
	Day/gen/de/smbsolutions/day/R.java
	Day/src/de/smbsolutions/day/functions/objects/SliderMenu.java
	Day/src/de/smbsolutions/day/functions/tasks/BitmapWorkerTask.java