Android ZenFoodApp
Merge branch 'master' of https://github.com/zuehlke-hae/camp.git

Conflicts:
	androidfxclient/.gitignore