remove .htaccess
Merge branch 'dev'
change config