Replaced WebScarab references with OWASP ZAP in java code only
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