Merge pull request #117 from dennishendriksen/master

Remove original text (will be refused in the future)
Fix some build errors
Merge pull request #120 from jjettenn/molgenis-LL/1.2.2-LL-R2

Fix some build errors
Use protocols instead of features
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines

Conflicts:
	src/main/java/org/molgenis/lifelines/studymanager/QualityMeasureDocumentStudyDefinition.java