Fixing servlet 2.5 schema
Cleaning up imports
Fixing pathfinder app path
merge changes from kmudrick (fixes #4, see integration branch for details)
lib-spring: rework context file loading (fixes #2)
merge from master