fixed contao namespace bug
Merge branch 'master' into dev