Updated to specific version of grunt-contrib-qunit to fix travis CI build errors
Merge branch 'master' into feature/gruntflow