fixed a bug where url with hostname port number will break url regex.
another fix to url/email escaping
Merge branch '1.83'

Conflicts:
	app/views/scripts/viewer/index.phtml