Aditional resources, blog , etc
Merge remote-tracking branch 'origin/develop-theme' into sprint-5

Conflicts:
	docroot/sites/all/themes/osha_frontend/templates/field--field-aditional-resources.tpl.php