Änderung der Bilder
Merge remote-tracking branch 'origin/master'

Conflicts:
	MotivateMe/bin/classes/android/support/v7/appcompat/R$layout.class
	MotivateMe/bin/classes/com/motivateme/R$id.class
	MotivateMe/bin/classes/com/motivateme/R$layout.class
	MotivateMe/bin/classes/com/motivateme/R$string.class