Update .htaccess
Merge branch 'dev' into master