Created DDS branch
Merge branch 'dds' of github.com:joosth/workflow4people into two

Conflicts:
	grails-app/controllers/org/workflow4people/DataModelEditorController.groovy
Shortened the sleep
- Added wfp.id config item to integration test for DocumentService (needed after DDS merge)
- commented out stor-and-forward queue in activemq.xml