added cardlibs and changed AddFoodActivity to scrollview
Merge branch 'psuedo_master'