Fixing first trivial build issue, one more problem in app-schema remains
Merge branch 'master' of git://github.com/geoserver/geoserver