add conflict when running schedular and rename zk to data in lib/module
Merge branch 'develop' of github.com:xiaocong/remote-task-web-app into develop