Merge branch 'master' into configurable-ports

Author: Awk34

Diff for: templates/app/_package.json

@@ -46,7 +46,7 @@
     "del": "^2.0.2",
     "gulp": "^3.9.1",
     "gulp-add-src": "^0.2.0",
-    "gulp-angular-templatecache": "^1.7.0",
+    "gulp-angular-templatecache": "^2.0.0",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-babel": "^6.1.2",<% if(filters.ts) { %>
     "gulp-typescript": "~2.13.0",