Merge branch 'release/7.x-1.0'
Enable www redirect, check for dev subdomain
Merge branch 'hotfix/htaccess-www-prod-only' into develop