Merge branch 'next' of https://github.com/webgoat-atlassian/WebGoat-1 into next

Conflicts:
	src/main/webapp/js/application.js

Author: act-ive

src/main/webapp/js/application.js

@@ -11,7 +11,7 @@ var app = function() {
         sideBarLeftInit();
         window.onresize = function(){
             sideBarLeftInit();    
-        };
+        }
         closePanel();        
     };
 
@@ -221,7 +221,6 @@ var app = function() {
         morrisPie: morrisPie,
         sideBarLeftInit:sideBarLeftInit
     };
-    
-    
 }();
 
+