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

Conflicts:
	contao/assets/.htaccess