Add htaccess to redirect to non-www, since this since on a development domain
Merge branch 'dev'