Merge branch 'develop'

Author: malte-christian

package.json

@@ -11,7 +11,7 @@
     "babel-runtime": "^5.8.0",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
-    "vue-loader": "^7.2.0",
+    "vue-loader": "^8.2.0",
     "webpack": "^1.12.9"
   }
 }