Upgraded to jasmine 2.0, fixed the tests that broke during the migration
Merge pull request #878 from fracmak/feature/jasmine2

Upgraded to jasmine 2.0