log4j
Merge branch 'master' of https://github.com/tixo/webdesktop
bug fix