Merge branch 'psuedo_master'
Merge branch 'psuedo_master'
Merge branch 'psuedo_master'
Merge branch 'psuedo_master'
Merge branch 'psuedo_master'
Merge branch 'psuedo_master'
Add auto complete text edit to Add Food Activity and is enable to grab data from nutrients db and fill them in the various editText fields. The data is updatable when user edit the the serving size. Right now, when the user hit the submit button, the food the is saved in the FoodRecordDatabase, which basically keep a record of what foods the user have eaten. And a few changes to other classes and layout.
Merge pull request #9 from tommy09ch/master

Add auto complete text edit to Add Food Activity and is able to grab
fix some bugs with UserProfileActivity, there are still some bugs with AddFoodActivity; I'll fix it later
add basic implementation of wedge summary activity
Merge pull request #10 from tommy09ch/master

add basic implementation of wedge summary activity
Merge branch 'master' into psuedo_master