renamed htaccess
Merge branch 'hotfix/fixHtaccess'