up code, by diwen
Merge branch 'dev'
Merge branch 'master' of github.com:wangdiwen/build_base_system