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