Merge branch 'master' into MF/layout-list

Conflicts:
	public/partials/item.html
	public/partials/new.html
restaurant cuisine choices
layout update (item.html)
Merge branch 'master' into MF/layout

Conflicts:
	public/partials/item.html
	public/partials/new.html
Merge pull request #4 from Gbeschbacher/MF/layout

Mf/layout