blaat
Push to upstream
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
added Editor for Individuals
changed the action value, now the individuals in the litter are stored again
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Merge branch 'testing' of github.com:molgenis/molgenis_apps
edited the importer, edited the editor.. pair programming with Ate
pulled from ate
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps into testing
pulled from Dennis
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
removed test output
deleted the target_id
Changed VcfToTable.ftl to work with new script. Also updated in-house gpfs params csv to work with new template.
Merge pull request #402 from ChaoPang/master

fix the errors that is caused changes made in last month
added date to exported file name. Updated the action value when clicking through the different datasets
rename HL7 importer