Merge pull request #12 from xiaoqin2012/master

merge with xiaoqin
Make api sensible. fix UI to use new API
Merge remote-tracking branch 'origin/master'

Conflicts:
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/RecommendedFood.java
	NutritionTracker/NutritionTracker/app/src/main/java/net/tigerparents/nut/nutritioninfo/NutritionReport.java
Make api sensible. fix UI to use new API
Merge pull request #33 from piaw/master

make api make sense. use new api