Fix_htaccess
Merge branch 'hotfix/htaccess_fix'