Start working on plugin stuff
Merge branch 'master' into plugins
Add resolveURI and other plugin changes
resolveURI fixes
Implement ServletList and assoiated