Merge branch 'mwong-branch' into tngyn-branch

Conflicts:
	public/css/cook-easetest.webflow.css
Editing width of autocomplete box
merge issues