fix act-1054
fix act-1204
update fix act-1204
merge with master
update act-1204
Merge branch 'master' of https://github.com/smirzai/Activiti
Added pull request 25