Merge branch 'master' of github.com:yucong/conductor
remove unnecessary pages
Merge branch 'master' of github.com:yucong/conductor
Merge branch 'master' into dev
fix bug