Quick changes to support config item
Merge branch 'master' of github.com:youngrewiredstate/pyrosite

Conflicts:
	web/addons/shared_addons/modules/events
Merge branch 'refs/heads/develop'
Merge branch 'release/v1.2.5'
Merge branch 'release/v1.2.6'
Merge branch 'refs/heads/develop'
Merge branch 'release/v1.2.7'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'release/v1.2.7.1'
Merge branch 'release/v1.3'
Merging newer event changes
Merge branch 'hotfix/e' into develop