Merge branch 'research_guides' into dev

Conflicts:
	research/guides/index.php
Update DSS pages
Merge branch 'update-dss-pages' into staging
Merge branch 'staging'