Merge branch 'master' into selected-pantry

Conflicts:
	public/main.js