Move the references to javax.servlet into the anonymous class
Merge pull request #857 from HiJon89/master

Move the references to javax.servlet classes into the anonymous class
Use 'mvn license:format -N' at top of project to add missing headers
Results of 'mvn license:format -N' plus some minor tweaking
Merge pull request #845 from mcculls/add-missing-license-headers

Add missing license headers (and support easy means to add headers in the future)