Merge pull request #751 from dennishendriksen/master

Accomodate study definition updates
Merge pull request #752 from dennishendriksen/master

Context URL fixes
removed the no-spring html code out of the freemarker templates
added java changes + ngs ftl changes
deleted non spring code protocolviewer
removed comments
Merge pull request #753 from RoanKanninga/master

removed the no-spring html code out of the freemarker templates
Fix NGS app