3.1 Release from OWASP/dev #439

3.1 into Master

Merge pull request #258 from OWASP/prerelease

Merging V3.0 Stable Code into Master

Updating JavaDoc to 2.4

Merge branch 'master' of https://github.com/markdenihan/owaspSecurity…

…Shepherd.git