Redirect from www to non-www in .htaccess
Merge branch 'master' into BootForm