解决Activiti Modeler的Rest与Activiti-Rest模块实现类冲突问题
添加finalName
Update README.md
Merge remote-tracking branch 'remote/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml