Comment out as no mocks to test right now
Merge branch 'master' into dev
Merge branch 'master' into dev
Adding karma packages. Switch to PhantomJS browser testing