basic contao 3.2 modifications
Merge branch 'dev' into contao-3.2
contao 3.1 compatibility