install angularjs
Merge origin/master