cleaned cache, removed .tmp, .htaccess
Merge branch 'master' into gh-pages