Switched logs to slf4j, tests fail
Removed duplicated imports
Merge branch 'master' into slf
Fixed migration to slf4j, added updates from master