neuster Stand mit remi gemerged
foodlogFragment abgesdchlossen, db fehler
remi neuster stand
Merge remote-tracking branch 'origin/Eric' into Remi

Conflicts:
	MobileHealth/src/de/hdm/mobile/health/HelperActivity.java
Merge Save
Test