Fix
fixMerge branch 'master' of github.com:ikishik/dsdstore

Conflicts:
	app/views/categories/show.html.erb