lib-spring: repackage
Merge remote-tracking branch 'base/master'
Merge branch 'master' into dev-spring-resource
add ResourceLoader, with support for file and classpath