Fix for www
add 'www' to base domain based on a conf setting
Merge branch 'hotfix/www_prefix' into develop