Replace special characters with html entity hex codes.
Merge branch 'master' into deployment

Conflicts:
	index.html