update from old_guide
Merge branch 'master' of https://github.com/jingyanjiaoliu/angular-guide-zh
ready for reviewing
Merge branch 'master' of https://github.com/jingyanjiaoliu/angular-guide-zh