.htaccess
Merge branch 'dev'