Strip html tags and support inserttags
Bugfix: alias is not being (re-)generated anymore for variants if not allowed.
The config now does "deep assignments"
See https://github.com/MetaModels/core/issues/193
Add missing xhtml template
Merge branch 'master' into dev
Merge branch 'origin/dev'