Merge branch 'Rays'
update database SQL
remove useless .htaccess files
Merge branch 'master' into Rays