add npm and grunt -cli in init_ubuntu
Merge branch 'master' of https://github.com/dycforever/conf_bak