Merge branch 'develop'

* develop:
  remove log
fix CWD line's color wrong
Merge branch 'master' into develop