Added missing JavaDoc
Don't externalize tokens used in the parsing process
Clean up imports
Specified the 1.5 SE as execution environment
Merged from branch
Update Version to 1.1.1
Make TODO a comment
Removed unnecessairy dependencies
Make sure that all sql parameters are used in upper case to inhibit confusion
Clean up many warnings