reset extensions oauth, xdb, thymeleaf, sip, simple, jaxrs before merging with master
fix tests
remove libraries google.collections. replaced with google.guava