Merge branch 'develop'
Merge branch 'develop'
Delete config.xml~
Fix compatibility with Clever CMS
Fix bug where attributes are deleted upon insertion
Add template processor to default template