Logging stuff

ProxyLogger doesnt work yet
Merge branch 'master' of https://github.com/bg1987/ooad4