added some .htaccess files
merged stable to master