Updating template files
Updating template for browse all page
Merge branch 'Linnea' of https://github.com/CSTeachingTips/CSTTSite

Conflicts:
	public_html/sites/all/themes/cstt_theme/views-bootstrap-thumbnail-plugin-style--browse-all.tpl.php