System page navigation improvements, not finished
Merge branch 'develop' into ux
Merge branch 'develop' into ux
Fixes bug when deleting cms templates
Merge branch 'develop' into ux
Add hook for renderContent
Fix priority of local<->global events
Merge branch 'ux' into develop