Merging changes from Daniel back into the Spring Boot structure

- different js location
  - Fixed label debugging which kept on reloading and reloading the lesson
  - Changes from .jsp merged into .html

webgoat-container/src/main/resources/static/js/goatApp/controller/LessonController.js

@@ -11,6 +11,7 @@ define(['jquery',
     'goatApp/view/CookieView',
     'goatApp/view/ParamView',
     'goatApp/model/ParamModel',
+    'goatApp/view/DeveloperControlsView',
     'goatApp/support/GoatUtils',
     'goatApp/view/UserAndInfoView',
     'goatApp/view/MenuButtonView',
@@ -32,6 +33,7 @@ define(['jquery',
         CookieView,
         ParamView,
         ParamModel,
+        DeveloperControlsView,
         GoatUtils,
         UserAndInfoView,
         MenuButtonView,
@@ -49,6 +51,7 @@ define(['jquery',
             this.lessonProgressModel = new LessonProgressModel();
             this.lessonProgressView = new LessonProgressView(this.lessonProgressModel);
             this.lessonView = options.lessonView;
+            this.developerControlsView = new DeveloperControlsView();
 
             _.extend(Controller.prototype,Backbone.Events);
 
@@ -103,6 +106,7 @@ define(['jquery',
                 this.listenTo(this.helpControlsView,'hints:show',this.onShowHints)
                 this.listenTo(this.helpControlsView,'source:show',this.hideShowHelps);
                 this.listenTo(this.helpControlsView,'lesson:restart',this.restartLesson);
+                this.listenTo(this.developerControlsView, 'dev:labels', this.restartLesson);
 
                 this.helpControlsView.render();
 
@@ -124,6 +128,7 @@ define(['jquery',
                     this.lessonHintView = new HintView();
                     this.cookieView = new CookieView();
 
+
                     //TODO: instantiate model with values (not sure why was not working before)
                     var paramModel = new ParamModel({});
                     paramModel.set('scrParam',this.lessonContent.get('scrParam'));

webgoat-container/src/main/resources/static/js/goatApp/view/DeveloperControlsView.js

@@ -24,7 +24,7 @@ function(
 	    onLabelsLoaded: function(model) {
 	    	this.models[1] = model;
 	    	this.render();
-	        Backbone.history.loadUrl(Backbone.history.getFragment());
+			this.trigger('dev:labels')
 	    },
 
 		initialize: function(options) {