Merge branch 'master' into typo3-development
[TASK] Enable .html at the end of url
[TASK] Add rewrites
[TASK] Add rewrites
Merge branch 'typo3-development' of github.com:bmoex/typo3-serfhos.com into typo3-development
[TASK] Remove unused enters
[TASK] Remove joh316 install password
[MERGE] Merge branch 'typo3-development'