update
Merge branch 'master' of https://github.com/basestyle/angularjs-cn
Merge branch 'master' of https://github.com/basestyle/angularjs-cn