Data updated
Merge pull request #1 from wxt2005/dev

Data updated
Merge pull request #2 from wxt2005/angularjs

Data updated