Merge branch 'master' of https://github.com/molgenis/molgenis
fix freemarker number formatting bugs
Merge branch 'master' of https://github.com/molgenis/molgenis
fixed the sorting of data items in the catalogue
Merge branch 'master' of https://github.com/molgenis/molgenis
removed the comments
Merge pull request #379 from ChaoPang/master

fixed the sorting of data items in catalogue after searching
Merge branch 'master' of https://github.com/molgenis/molgenis
removed 'w' in function
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #380 from RoanKanninga/master

removed 'w' in function
Merge branch 'master' of https://github.com/molgenis/molgenis
hide tree top node if the search result is null
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #381 from ChaoPang/master

Hide the tree if search result is null
resolve compiler warnings in generated classes (+ small cleanups)
fix compiler warnings, update decorators so that they can be used in generated code
rename plugins to prevent shadowing
update jetty plugin (fixes windows file locking issue)
resolve compiler warnings