Merge branch 'master' into staging

Conflicts:
	src/scripts/modules/header/header-template.html
Merge branch 'master' into staging
Replace Error 9000 with generic error message
Merge branch 'master' into staging
Suggest reloading the page to fix generic issues
Find hash fragment content after content loads
Merge pull request #669 from Connexions/improved-error-page

Replace Error 9000 with generic error message
Merge pull request #672 from Connexions/jump-to-fragment-after-load

Find hash fragment content after content loads
Merge branch 'master' into staging
Merge branch 'staging' into production

Conflicts:
	src/scripts/modules/header/header-template.html