updated mockito dependency
Merge branch 'master' of github.com:rieske/aop-logging