to merge
Merge branch 'master' of github.com:molgenis/molgenis
New command line flags for db
Merge pull request #339 from mdijkstra/master

New command line flags for db