Changed backgrounds and stuff
Merge remote-tracking branch 'origin/master' into fusion

Conflicts:
	Splurge/res/layout/dining_out.xml
	Splurge/res/layout/food_menu_list.xml
Merge remote-tracking branch 'origin/fusion' into fusion

Conflicts:
	Splurge/res/values/colors.xml