Update tests for promise
Update tests for promise
Update angulars to latest version: 1.2.9
Update dev and prod dependencies
Merge branch 'master' into heroku
Merge from master