Merge branch 'master' into greenkeeper-browserify-12.0.0

# Conflicts:
#	package.json

package.json

@@ -33,18 +33,18 @@
   },
   "homepage": "https://github.com/entrecode/ec.datamanager.js",
   "devDependencies": {
-    "browserify": "12.0.0",
+    "browserify": "12.0.1",
     "chai": "2.3.0",
     "chai-as-promised": "5.1.0",
     "coveralls": "2.11.4",
     "ec.appcms-mock.js": "git+https://stash.entrecode.de/scm/cms/ec.appcms-mock.js.git#develop",
     "grunt": "0.4.5",
-    "grunt-browserify": "3.8.0",
-    "grunt-contrib-uglify": "0.9.2",
+    "grunt-browserify": "4.0.1",
+    "grunt-contrib-uglify": "0.10.0",
     "grunt-karma": "0.10.1",
     "grunt-mocha-test": "0.12.7",
     "grunt-run": "0.3.0",
-    "istanbul": "0.3.22",
+    "istanbul": "0.4.0",
     "karma": "0.12.37",
     "karma-chai-plugins": "0.5.2",
     "karma-chrome-launcher": "0.1.12",
@@ -55,7 +55,7 @@
     "karma-safari-launcher": "0.1.1",
     "mocha": "2.3.3",
     "mockery": "1.4.0",
-    "sinon": "1.17.1",
+    "sinon": "1.17.2",
     "sinon-chai": "2.8.0",
     "supertest-as-promised": "2.0.2",
     "uglify-js": "2.5.0"

readme.md

@@ -189,7 +189,7 @@ dataManager.model('myModel').getSchema()
 });
 
 // For PUT or POST schema:
-dataManager.model('myModel').getSchema('PUT')
+dataManager.model('myModel').getSchema('put')
 .then(…)
 ```
 
@@ -644,7 +644,7 @@ create a new entry. Returns the Entry.
 
 #### getSchema([method])
 
-retrieve JSON Schema. `method` is 'GET' by default. Other possible values: 'PUT', 'POST'.
+retrieve JSON Schema. `method` is 'get' by default. Other possible values: 'put', 'post'.
 
 ### Model Instance Properties