adjust this slightly to allow a 3rd party help module
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/themes/pyrocms/views/admin/partials/header.php
Merge branch 'refs/heads/3.0/develop' into AIWS/production