adding potential dinner options
Merge branch 'menu-20140112' into staging

Conflicts:
	menu