Merge branch 'feature/issue-2306_' of /Users/bodnia/Documents/work/prj/swagger-ui with conflicts.

package.json

@@ -13,7 +13,8 @@
   "license": "Apache-2.0",
   "main": "dist/swagger-ui.js",
   "scripts": {
-    "build": "gulp",
+    "build": "npm run handlebars && gulp",
+    "handlebars": "./node_modules/handlebars/bin/handlebars ./src/main/template -f ./src/main/template/templates.js",
     "serve": "gulp serve",
     "prejshint": "gulp",
     "jshint": "jshint .",
@@ -37,7 +38,6 @@
     "gulp-concat": "^2.5.2",
     "gulp-connect": "^2.2.0",
     "gulp-declare": "^0.3.0",
-    "gulp-handlebars": "^4.0.0",
     "gulp-header": "^1.2.2",
     "gulp-jshint": "^1.10.0",
     "gulp-less": "^3.0.1",
@@ -46,6 +46,7 @@
     "gulp-uglify": "^1.1.0",
     "gulp-watch": "^4.1.1",
     "gulp-wrap": "^0.11.0",
+    "handlebars": "^4.0.5",
     "http-server": "^0.8.0",
     "jshint-stylish": "^1.0.1",
     "karma": "0.13.19",