Theme changes
Merge remote-tracking branch 'origin/develop' into develop-theme

Conflicts:
	docroot/sites/all/themes/osha_frontend/images/social-icons/sm/facebook.png
	docroot/sites/all/themes/osha_frontend/images/social-icons/sm/flickr.png
	docroot/sites/all/themes/osha_frontend/images/social-icons/sm/twitter.png
Deleted old social icons