Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #407 from erwinwinder/master

 Move vcf reader to genotype-reader
id is a String instead of a number, so ?c in Freemarker fails
Merge branch 'master' of https://github.com/molgenis/molgenis
Security on CatalogueLoaderPluginPlugin istead of CatalogueLoaderPlugin
And StudyDefinitionLoaderPluginPlug instead of StudyDefinitionPlugin
added users "datamanager" and "researcher" with their specific
permissions
do not store admin password in source but in molgenis-server.properties
add "lifelines" to property names
added default nullavalue for @Value from the propertiesfile
Merge pull request #408 from bartcharbon/master

added users "datamanager" and "researcher" for lifelines + do not store "admin" password in source
Fix for github issue #383 ElasticSearchService create mapping fails if data set name contains # bug