Added some .htaccess
Merge origin/master