test to verify hanging on failed load of iframe
Merge commit '8cceb8b9d955686a4a435224304a24ce2896c0c3'

Conflicts:
	package.json
use fixed version of grunt-lib-phantomjs to update https://github.com/gruntjs/grunt-contrib-jasmine/pull/44
Added a filter flag, to filter through the *Spec files

This allows to filter through the *Spec.js files, without modifying Gruntfile.js
Fixed missing junit failure output (#76)
Slight refactor
PhantomReporter made not to break IE. Closes GH-71.
Update copyright to 2013
Update jshint and devDeps
Fixed link to Camille Reynder's site
Merge pull request #78 from ChrisWren/patch-1

Fixed link to Camille Reynder's site
Merge pull request #77 from existentialism/junit-failure-output

Fixed missing junit failure output (#76)
Merge branch 'master' of https://github.com/HBehrens/grunt-contrib-jasmine into HBehrens-master

* 'master' of https://github.com/HBehrens/grunt-contrib-jasmine:
  use fixed version of grunt-lib-phantomjs to update https://github.com/gruntjs/grunt-contrib-jasmine/pull/44
  test to verify hanging on failed load of iframe

Conflicts:
	package.json
Merge branch 'filter' of https://github.com/stilva/grunt-contrib-jasmine into stilva-filter

* 'filter' of https://github.com/stilva/grunt-contrib-jasmine:
  Added a filter flag, to filter through the *Spec files
updated documentation
updated documentation
0.5.2
Removed unused 'phantomjs' options object from task per issue #82 in main repo.
Merge pull request #83 from jakerella/master

Removed unused 'phantomjs' options object from task
Remove Gruntfile.js as main in package.json