Merged in the fix for the redirect box being broken into the fix for the "www" redirect.
Merge branch 'master' into Issue_3520-Redirect_without_www

Conflicts:
	app/controllers/redirect_controller.rb
Merge pull request #1187 from ariana-paris/Issue_3520-Redirect_without_www

Merged in the fix for the redirect box being broken into the fix for the "www" redirect