Changed runtime property location of CGD
CGD Annotator change: Data from cad is now loaded into a CgdData object. Previously, for every row the file would be read. Data is now stored once, and with lazy loading is checked if not empty. Adjusted test.
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Choose between attr names or labels in csv download
Merge branch 'master' of github.com:molgenis/molgenis
Fix filterwizard title
fix nullpointer in das server
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1567 from erwinwinder/master

Choose between attr names or labels in csv download
Merge pull request #1569 from bartcharbon/master

Bugfixes in DASserver and Dataexplorer Filter Wizard
Merge pull request #1548 from Mark-de-Haan/master

Made CGD annotater faster by not reading the cgd file for every row in the dataset
Merge remote-tracking branch 'upstream/master'