Uebung hinzufuegen actifity!!!
Profil Edittext in Textviews geändert
Merge branch 'master' of https://github.com/Nikki2/Fitti
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
fixup! Merge branch 'master' of https://github.com/Nikki2/Fitti
Commit vor Reparieren
Merge branch 'master' of https://github.com/Nikki2/Fitti
Merge branch 'master' of https://github.com/Nikki2/Fitti
Trainingspläne hinzufügen Datenbankklasse fertig.
Merge branch 'master' of https://github.com/Nikki2/Fitti
Merge branch 'master' of https://github.com/Nikki2/Fitti
Merge branch 'master' of https://github.com/Nikki2/Fitti
ids geändert