moved list of highlights to /highlights and show newsletter subscribe block
Merge branch 'newsletter_subscribe' into develop

Conflicts:
	docroot/sites/all/modules/osha/osha_newsletter/osha_newsletter.module
Display settings for news
Merge branch 'news' into develop