commit
Merge branch 'master' of https://github.com/stevenzyang/calfood

Conflicts:
	eclipse_project/src/com/floor7/calfood/MainActivity.java