added tifn project
fix merge
fix merging
fixing merge
resolve merge
adapted database metadata generation for omx 2.2 model
deleted unused files cbm
fix merge
changed the molgenis_ui
Added cbm project
Added home/setup screen to TIFN
added .gitignore file + added cbm project to the molgenis pom
deleted index.html from cbm project
stopped using method getObservableFeatureCategoryCollection() cos it has been removed
Merge pull request #25 from ChaoPang/master

stopped using method getObservableFeatureCategoryCollection() cos it has been removed
Merge pull request #24 from RoanKanninga/master

Adapted database metadata generation for omx 2.2 model
Merge branch 'master' of github.com:molgenis/molgenis