Stand Florian
Exercise Overview angepasst
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
Vorbereitung auf Master Merge
Gitignore angepasst
Fix Activity Bug:
Einbindung Menü in die anderen Klassen
Implementierung Live-Search Methode in ExerciseAdd OnCreate
MenuNavigation Layout
MenuNavigation
Merge remote-tracking branch 'origin/Eric' into Eric

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