Commit
Merge branch 'master' of https://github.com/Nikki2/Fitti
Merge branch 'master' of https://github.com/Nikki2/Fitti
Commit 2
Merge branch 'master' of https://github.com/Nikki2/Fitti

Conflicts:
	Fitti_app/Code/fittiapp/fitti_app_2.0/res/layout/activity_profil.xml
	Fitti_app/Code/fittiapp/fitti_app_2.0/res/layout/activity_trainingsplan_hinzufuegen.xml