fix bug
Merge branch 'dev'
Merge branch 'master' of github.com:yucong/conductor
fix bug
Merge branch 'master' of https://github.com/yucong/conductor
add index
fix bug
add right panel index
Merge branch 'master' of github.com:yucong/conductor
merge master and deal conflicts