Some work needed to run simple-workflow module on QA
Merge branch 'master' of github.com:Activiti/Activiti