WEB-28
    indented lab stages
changed .gitignore
Merged branch 'next' of https://github.com/WebGoat/WebGoat into next
WEB-43 Implement Accordion on Menu

tried to implement jQuery UI Accordion; issues raised in the ticket
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next

Conflicts:
	src/main/webapp/WEB-INF/pages/main_new.jsp
	src/main/webapp/css/main.css
overrode the local with the remote version
modified for working around files created during merge
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next

Conflicts:
	.gitignore
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
WEB-65
main_new.jsp -> sidebar left: first-level children's indentation is missing

added indentation for first-level children; swapped "span" and "i" in
<a ng-click="expanded = !expanded" href=""><span>{{item.name}}</span><i class="fa {{item.class}}"></i></a>
so that the icon did not appear to belong to the menu item above the current one (in some cases this occured).
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
WEB-64
The left-side navigation bar now appear to be of the same height as the browser window's height. The bar's height also changes when the window is resized.
Testing is carried out in two recent versions of Firefox and Chrome.
WEB-64
The left-side navigation bar now appear to be of the same height as the browser window's height. The bar's height also changes when the window is resized.
Testing is carried out in two recent versions of Firefox and Chrome.
missed a semi-colon
Merge branch 'next' of https://github.com/webgoat-atlassian/WebGoat-1 into next

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