Merge branch 'master' of github.com:yucong/conductor
Merge branch 'dev'
fix multi
Merge branch 'dev'
deal with multi user edit issue
fix bug
8080
fix bug