Merge branch 'master' into issue-2747

Author: Awk34

Diff for: templates/app/_package.json

@@ -45,7 +45,7 @@
     "passport-google-oauth20": "^1.0.0",<% } %><% if(filters.ws) { %>
     "primus": "^7.0.1",
     "primus-emit": "^1.0.0",
-    "uws": "^10.148.0",<% } %>
+    "uws": "10.148.1",<% } %>
     "serve-favicon": "^2.3.0"
   },
   "devDependencies": {