Update deps
Merge branch 'master' into sprint-one

Conflicts:
	Gemfile.lock
Fix recipe list row splitting