fix images issue
Merge branch 'master' into heroku-master

Conflicts:
	public/partials/store.html