add .htaccess
Merge origin/master