Merge branch 'master' of github.com:PLOS/ambra
Merge branch 'master' into dev-corrections

Conflicts:
	webapp/src/main/webapp/javascript/global.js
Merge branch 'dev-corrections' of github.com:PLOS/ambra into dev-corrections
set version in pom fiiles to 2.9.7
Merge remote-tracking branch 'origin/dev-corrections' into release/2.9.7rc

Conflicts:
	webapp/src/main/webapp/javascript/global.js