Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/catalog_show.html
	build/profile.html
	catalog_show.haml
	profile.haml
Refactoring