bug fix for the server
Merge branch 'rock' of github.com:moma/ProjectExplorer into rock