Merge branch 'psuedo_master'
added method to get all food from foodDB.
added method to get all foods from FoodDB
added calculation method for nutrient
Merge branch 'master' of https://github.com/thomt/Innutrac

Conflicts:
	bin/Innutrac.apk
	bin/classes.dex
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity.class
	bin/resources.ap_
merge fix
Merge branch 'master' into psuedo_master
changed button on AddFoodActvity
new resources