Merge branch 'develop_2.0' into JSONEditor

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/coffeescript/view/MainView.coffee
	src/main/coffeescript/view/OperationView.coffee
	src/main/coffeescript/view/ParameterView.coffee
	src/main/coffeescript/view/ResourceView.coffee
	src/main/coffeescript/view/SignatureView.coffee
	src/main/html/index.html

.gitignore

@@ -1,13 +1,15 @@
-.DS_STORE
-*.ipr
-*.iml
-*.iws
-web/
-lib/*.zip
-version.properties
-.sass-cache
-swagger-ui.sublime-workspace
-.idea
-.project
-node_modules/*
+.DS_STORE
+*.ipr
+*.iml
+*.iws
+*.flags.json
+npm-debug.log
+web/
+lib/*.zip
+version.properties
+.sass-cache
+swagger-ui.sublime-workspace
+.idea
+.project
+node_modules/*
 /nbproject/private/