Bruce Mayhew 149e7ecc40 Merge branch 'next' of https://github.com/WebGoat/WebGoat into next
Conflicts:
	src/main/java/org/owasp/webgoat/lessons/DBSQLInjection/DBSQLInjection.java
	src/main/java/org/owasp/webgoat/lessons/FailOpenAuthentication.java
	src/main/java/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java
	src/main/java/org/owasp/webgoat/lessons/WsSqlInjection.java
2014-09-15 21:59:30 -04:00
..