Add AngularJS
Merge branch 'dev'