my file
commit to merge
ignore file
my file
commit deleted
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 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.