small change in property name
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #418 from georgebyelas/master

merged conflict; send new pull request
Merge branch 'master' of https://github.com/molgenis/molgenis
#395 MOLGENIS assumes the xref_label is always a String
escaped the illegal characters in description
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #421 from ChaoPang/master

Escaped the characters in description for dynatree
Merge pull request #419 from bartcharbon/master

Fixed #395 + minor change lifelines property
Fix for problem introduced by previous pull request (419)
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #422 from bartcharbon/master

Fix for problem introduced by previous pull request (419)
Merge branch 'master' of https://github.com/molgenis/molgenis
pilots with ids in PilotService