Meal Suggestor Complete
Merge branch 'master' of
https://github.com/practitioner/CommonGround.git

Conflicts:
	UFMealMeter/bin/UFMealMeter.apk
	UFMealMeter/bin/classes.dex
	UFMealMeter/bin/resources.ap_
	UFMealMeter/res/values/strings.xml