Model changes to simple workflow
Merge branch 'master' of https://github.com/Activiti/Activiti
Merge from upstream/master