working on adding show pages
Merge remote-tracking branch 'origin/master' into sources

Conflicts:
	app/assets/templates/search.html.haml
Merge remote-tracking branch 'origin/master' into sources
typed into files