Merge branch 'master' into husky

Author: kamilkisiela

package.json

@@ -57,11 +57,11 @@
     "husky": "^0.12.0",
     "jest": "^17.0.0",
     "reflect-metadata": "^0.1.8",
-    "remap-istanbul": "^0.8.0",
+    "remap-istanbul": "^0.8.4",
     "rimraf": "^2.5.2",
-    "rollup": "^0.37.0",
+    "rollup": "^0.38.0",
     "rxjs": "5.0.0-rc.4",
-    "tslint": "^4.0.1",
+    "tslint": "^4.2.0",
     "typed-graphql": "^1.0.2",
     "typescript": "~2.0.6",
     "validate-commit-msg": "^2.8.2",