Merge pull request #105 from dennishendriksen/master

Fix test
move resources from webapp to main/resources
Merge pull request #113 from bartcharbon/master

move resources from webapp to main/resources
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines
Replace resource manager calls with catalog service calls