Merge branch 'master' into sprint-one

Conflicts:
	Gemfile.lock
Fix recipe list row splitting
Merge branch 'sprint-one' into staging

Conflicts:
	Gemfile.lock