Add most important .htaccess file
Merge origin/master