this is baaaad
Merge branch 'interaction' of github.com:Fonserbc/dinnerplanner-android into interaction

Conflicts:
	res/drawable/custom_border.xml
	res/drawable/custom_border_off.xml
	res/layout/dish_preview.xml