T
Merge branch 'Eric' of https://github.com/es059/Mobile-Anwendungen.git
into Eric

Conflicts:
	WorkoutLog/res/layout/fragment_central_add_set.xml
Material Design