Merge branch 'store'

Conflicts:
	Gemfile.lock