Add AngularJS Scaffolding
Merge branch 'dev'