Merge pull request #701 from leider/master

Replaced QUnit with Jasmine