fix build
Merge branch 'master' of github.com:geomajas/geomajas-project-server