Merge branch 'master' into ui_expansion
add new activity
Reformat add_new_food activity (look nicer)
Merge branch 'TommyBranch' into ui_expansion
xml changes to add_food and added resources
added resources and layouts
added back button to actionbar in add_food activity
changed holographlibrary to project and created history fragment
changed to reflect new dependency on holographlibrary
taking in resolution from PieView now and commented out some code causing problems