merge fixes

Author: Awk34

Diff for: templates/app/_package.json

@@ -214,6 +214,7 @@
     "npm": "^3.9.5"
   },
   "scripts": {
+    "postinstall": "gulp copy:fonts:dev",
     "lint": "npm run lint:client && npm run lint:server",
     "lint:client": "eslint ./client/**/*.<%= scriptExt %> -c ./client/.eslintrc --ignore-pattern *.spec.<%= scriptExt %>",
     "lint:server": "eslint ./server/**/*.js -c ./server/.eslintrc --ignore-pattern *.spec.js --ignore-pattern *.integration.js",

Diff for: templates/app/webpack.make.js

@@ -388,7 +388,9 @@ module.exports = function makeWebpackConfig(options) {
             colors: true,
             chunks: false,
         },
-        historyApiFallback: true,
+        historyApiFallback: {
+            index: 'app.html'
+        },
     };
 
     config.node = {