show two hard coded activities in timeline, fix in activiti release
Merge branch 'master' of github.com:inheritsource/pawap