Upgrade Jasmine to v2
Merge branch 'master' into cluster-listings
fix tests