letzte Änderung Alex
Merge remote-tracking branch 'origin/master'

Conflicts:
	MotivateMe/bin/MotivateMe.apk
	MotivateMe/bin/R.txt
	MotivateMe/bin/classes.dex
	MotivateMe/bin/classes/com/firstsetup/FragmentStartInfo.class
	MotivateMe/bin/classes/com/firstsetup/FragmentTarget.class
	MotivateMe/bin/classes/com/motivateme/MainActivity.class
	MotivateMe/bin/classes/com/motivateme/R$id.class
	MotivateMe/bin/classes/com/motivateme/R$integer.class
	MotivateMe/bin/classes/com/motivateme/R$layout.class
	MotivateMe/bin/classes/com/motivateme/R$menu.class
	MotivateMe/bin/classes/com/motivateme/R$string.class
	MotivateMe/bin/classes/com/motivateme/R$style.class
	MotivateMe/bin/classes/com/motivateme/R$styleable.class
	MotivateMe/bin/classes/com/running/FragmentRunning.class
	MotivateMe/bin/resources.ap_
	MotivateMe/gen/com/motivateme/R.java