add .htaccess
delete strange files
merge develop