Merge branch 'master' into staging
switched TERP from herkou demo to live OST, added anchor for quick navigation to the TERP iframe
removed named anchor as it messes with other link processing
removed debug statements
Merge pull request #628 from jpslav/terp-ostlink

Changed TERP iframe to point to live OST instead of Heroku demo
Merge branch 'master' into staging

Conflicts:
	src/scripts/loader.coffee
	src/scripts/modules/header/header-template.html
Merge branch 'staging' into production

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