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

Conflicts:
	Fitti_app/Code/fittiapp/fitti_app_2.0/project.properties