my file
commit to merge
ignore file
my file
commit deleted
fix for generate tests
Merge pull request #207 from dennishendriksen/master

Do not generate test classes for generators that don't have a test class
do not expose non-system fields of system entities
Merge pull request #211 from dennishendriksen/master

Do not expose non-system fields of system entities
fix app-lifelines call to FillMetaData
minor changes; full log added
Start/stop gui
Refactor
Workflow parser
minor-minor changes
Merge pull request #213 from georgebyelas/master

added full log field
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-compute-db/src/main/resources/model/compute.xml
Merge pull request #214 from erwinwinder/master

Refactor, start/stop gui, workflow import
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge 'branch compute-bash' with master branch, having had a lot of trouble. Hopefully molgenis-compute-core is now fixed.
Merge pull request #215 from mdijkstra/master

Merge 'compute-bash' branch in master branch.
If output path (called 'workdir') is specified in parameters.csv and has relative path, then we assume that this relative path starts at the same location as the parameters.csv that refers to it. This is consistent with what we did previously for e.g. workflow.csv.