Stand Florian
Merge remote-tracking branch 'origin/Florian' into Remi

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