test
Merge branch 'dev' into angular_tests
angular admin
Merge pull request #35 from CanvasApp/angular_tests

Angular tests