Merge branch 'master' into dev
minor fix for htaccess
Merge branch 'dev'