Save
Merge remote-tracking branch 'origin/Remi' into Eric

Conflicts:
	MobileHealth/bin/resources.ap_
User-Account wird in Datenbank gespeichert. First-Time-Check angepasst
Barcode-Feld bei AddFood hinzugefügt.
Save
Merge branch 'Eric' of https://github.com/es059/IT-Workshop.git into
Eric

Conflicts:
	MobileHealth/bin/resources.ap_
	MobileHealth/project.properties