Merge pull request #683 from dennishendriksen/master

Update spring 3.2.2 --> 3.2.3 + replace cobertura with jacoco
Merge pull request #684 from dennishendriksen/master

Revert jacoco changes
Bugfix: download content incorrect after search in the tree
(protocolviewer)
With the new style of logging in, "login" was a strange name for the
tab... it is now called Account
Merge pull request #685 from bartcharbon/master

Bugfixes is the protocol-viewer and omx-app
Merge pull request #686 from dennishendriksen/master

Improve jetty startup performance
rename cancel to restart in importer
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix height for iframes, iframe size was wrong in Firefox 22 and 23
added nillable for valueCode in Category + code format GIDS
Merge pull request #690 from bartcharbon/master

Rename "cancel" button to "restart" + Fix iframe Height in Firefox
Merge pull request #691 from RoanKanninga/master

added nillable for valueCode in Category + code format GIDS
Merge pull request #693 from dennishendriksen/master

Move catalog loader service from app-lifelines to mod-protocolviewer
add unload methods
add utility method to determine protocol descendankts