Generate tasks
Generate tasks
Merge remote-tracking branch 'origin/master'

Conflicts:
	molgenis-app-compute-db/src/main/java/org/molgenis/compute/db/controller/PilotDashboardController.java
Merge pull request #222 from erwinwinder/master

Generate tasks
for merging
Tasks generation and to merge