add angular.js
Merge branch 'angular' into trunk
Merge branch 'trunk'