updated colors and main
specified dimension for edge_padding
currently changing lots of things.. filter does not currently work, so don't worry
changed colors and added boarder dimension
Merge remote-tracking branch 'origin/SimpleUI' into SimpleUI
finally fully implemented changing icons for filter.. played around a little with formatting
Merge remote-tracking branch 'origin/SimpleUI' into SimpleUI
changed colors and added boarder dimension
got rid of help icon
made menu click pull up help menu
Layout.main cleaning
made structure of Review stuff
new icons, refactored background icons in main, added new icons to popupmenu, changed name of icons in MenuActivity
new icons, refactored background icons in main, added new icons to popupmenu, changed name of icons in MenuActivity
made runnable
Merge remote-tracking branch 'origin/SimpleUI' into SimpleUI

Conflicts:
	res/layout/main.xml
	res/values/dimens.xml
Merge branch 'SimpleUI'

Conflicts:
	src/main/java/com/softdev/Controller/MealListAdapter.java
	src/main/java/com/softdev/Controller/MenuActivity.java
Added DisplayItem class