adds vagrant setup, still uncomplete
updates vagrant config
updates vagrant config
updates vagrant config
updates vagrant config, fixes jboss-util pom
* updates vagrant config - it runs through and server is started
  but some improvements are necessary, as stated in the bootstrap.sh
* jboss-util/pom.xml specifies the required dk version (to accept
  annotations)
statistics generation

updates plan statistics

adds durations, completes table 1

adds stage statistic generation (Table 2 )

times in minutes, aggregated decision length
fixes path to jboss tools, refs #236
change build to master branch
Merge branch 'vagrant-dev' into integration
prevents busy conversation exceptions
* file uploads in define samples happen now in a modal dialog, so it is more clear to the user that no other actions can be taken during upload.
  rich:fileUpload-event onUpload does not work, therefore it is not possible to keep the user from closing the dialog. #221
* in evaluate experiments the "please wait" is toggled during evaluation, prevents the user from triggering other actions. #221. fixes #214.
improves kbrowser plan selection
* plans marked as playground are not displayed in the list any more fixes #228
* playground flag is now exported and imported
improves collection profile handling
* old collection profile data is now deleted before new one is stored
* list of objects from collection profile is now refreshed when entering step create executable plan, fixes #235
FITS evaluator recognizes JPEG 2000 Lossless correctly, fixes #234
Merge branch 'mk_eff_3' into integration

Conflicts:
	ABOUT.md
fixes integration tests
fixes plan import (fixes #231)
* experiment.workflow is now imported properly
re-adds openjdk7 build to travis config
Merge branch 'integration'

Conflicts:
	ABOUT.md