Revert "Revert "Delete ErrorPage.htm""

This reverts commit d03aec717ddcc09c623bd1fe09776755a2d4bb39.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ErrorPage.htm
Revert "Revert "Revert "Delete ErrorPage.htm"""

This reverts commit 9823db189fbff98b5c1e18a5196b4d4e25f654c0.

Conflicts:
	ErrorPage.htm