Merge branch 'master' into develop
Fix editing templates
update installer
modx update
better apply css
update css
Merge branch 'develop'