Revert "Bring master up to date from next"
Merge pull request #19 from WebGoat/revert-17-master

Revert "Bring master up to date from next"