Looking at what we need for the front page.
News
Merge branch 'master' of https://github.com/syslabcom/osha.hwctheme

Conflicts:
	src/osha/hwctheme/templates/plone.app.portlets.portlets.news.pt
	src/osha/hwctheme/theme/HWManageStress.htm
	src/osha/hwctheme/theme/rules.xml
Got file back that got removed in teh merge.
Merge branch 'master' of https://github.com/syslabcom/osha.hwctheme