Relative path
Merge branch 'master' of https://github.com/molgenis/molgenis
Added extra command line parameters (default, rundir, database). Added validation for a.o. wrongly specified parameterMappings of which origin (stepx_ or user_) is unclear. Fixed some bugs to make impute2 pipeline generating.
Added -path parameter to workflow.csv, parameters.csv, ... And fixed some bug.
Merge pull request #293 from mdijkstra/master

Created impute2 workflow. Added extra cmnd-ln-parameters. Fixed bugs. Added error handling for wrong parameterMapping.
Merge pull request #294 from dennishendriksen/master

Simplify annotations using bean scoping, fix search security interceptor
typo fix
typo fix
Merge pull request #296 from bartcharbon/master

typo fix in the webappconfig
Added login to compute db
Fixed issue that relative -path was prepended each time compute was started to each of the parameters that comprise a path.
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-compute-db/src/main/java/org/molgenis/compute/db/generator/TaskGeneratorDB.java
Added all command line parameters as reserved words
Added validator which checks input-parameter names on allowed characters
And the validator which i forgot in prev commit
Added create(path) function for George so that he can easily start the impute2 pipeline
Merge pull request #297 from erwinwinder/master

Added login to compute db
Merge pull request #298 from mdijkstra/master

Fixed bugs. Improved compute.properties class.
changed the automatic reload configuration, the reload is now triggered by an enter in the console
changed the automatic reload configuration.....