added first version of the filter wizard
Merge branch 'master' of https://github.com/molgenis/molgenis
fix merge
fix merge 2
fix merge
the filter wizard is now working
removed wizard from protocolmanager
fixing some comments
Merge pull request #896 from RoanKanninga/master

added first version of the filter wizard