Merge pull request !242 from xingyu/master
Merge pull request !241 from W./master
2. 完整移除 activiti 遗留的东东