fix freemarker number formatting bugs
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
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
do not add methods to interface that exist in parent interfaces
clean up protocol viewer
resolve compilers warnings
resolve compilers warnings
resolve compiler warnings
Merge pull request #384 from dennishendriksen/master

Bug fixes and resolve compiler warnings
make logger final
resolve compiler warnings
index protocol tree when indexing dataset
revert changes (remove dependency on molgenis-omx-core)
move protocol tree indexing from elasticsearch mod to omx-core
fix compile errors