blabla
Merge branch 'master' of https://github.com/TheRealHaui/ASE_Term1_Mobile_Applications_Team_Project

Conflicts:
	Resources/mobileweb/alloy/models/Person.js
Merge branch 'master' of https://github.com/TheRealHaui/ASE_Term1_Mobile_Applications_Team_Project
zur View additionalinformation die Labels hinzugefuegt