Merge branch 'master' into angular-components
添加 ngResource
Merge branch 'angular-components'