Remove the `assets/.htaccess` file
Port the changes from contao/core@8151215705eb1e40ed27c5aa58ef6d978d453a24
Port the changes from contao/core@1ce210d917073da11cce936fe39d2aaf50b92fa2
Merge branch 'develop' into feature/symfony2

Conflicts:
	.tx/config
	contao/assets/.htaccess
	contao/assets/approved.gif
	contao/assets/pending.gif
	contao/assets/style.css
	contao/languages/en/tl_news_comments.xlf