Refactor deprecated code.
Merge pull request #1431 from erwinwinder/master

Fix some issues
Merge pull request #1432 from erwinwinder/master

Fix view submissions for lifelines
Fix of the data set deleter
Merge branch 'master' of github.com:molgenis/molgenis
Fix dataSet deleter;
Fix test class;
Merge pull request #1433 from jjettenn/master

Repair the data set deleter
Aggregates
Merge branch 'master' of https://github.com/molgenis/molgenis
Totals and test