agreement support
new web.xml support
clean up
Merge remote-tracking branch 'upstream/master'