Merge branch 'master' of https://github.com/jamesgary/grunt-contrib-jasmine into jamesgary-master

# Conflicts:
#	README.md
#	docs/jasmine-options.md
#	package.json
#	tasks/jasmine.js

docs/jasmine-options.md

@@ -26,11 +26,12 @@ Type: `String|Array`
 CSS files that get loaded after the jasmine.css
 
 ## options.version
-Type: `String`  
-Default: `'2.0.1'`
+Type: `String`
+Default: '2.2.0'
 
 This is the jasmine-version which will be used. currently available versions are:
 
+* 2.2.0
 * 2.0.1
 * 2.0.0
 

package.json

@@ -18,7 +18,7 @@
     "chalk": "^1.0.0",
     "es5-shim": "^4.0.1",
     "grunt-lib-phantomjs": "^1.0.0",
-    "jasmine-core": "^2.0.4",
+    "jasmine-core": "^2.2.0",
     "lodash": "~2.4.1",
     "rimraf": "^2.1.4"
   },

tasks/jasmine.js

@@ -70,7 +70,7 @@ module.exports = function(grunt) {
 
     // Merge task-specific options with these defaults.
     var options = this.options({
-      version: '2.0.1',
+      version: '2.2.0',
       timeout: 10000,
       styles: [],
       specs: [],