Eric Version und Remi Version angepasst, bzw manuell gemerged.
Merge remote-tracking branch 'origin/Remi' into Eric

Conflicts:
	WorkoutLog/bin/jarlist.cache
	android-support-v7-appcompat/bin/android-support-v7-appcompat.jar