Error page changes
Merge branch 'master' of github.com:rationalAgent/edx-platform-custom