Removed logback-test from resources (oops)
Merge branch 'master' into maven