Update htaccess 404 redirect for new URL.
Merge branch 'master' into deployment

Conflicts:
	.htaccess