Add commons-io
Implement WAT annotator
Merge branch 'master' into wat-inclusion
Merged the master into this branch. Added a simple test class. Made some minor changes in the mapping classes.