GEOS-5618: app-schema joining wrongly groups nested children to the first feature if using getID()
GEOS-5618: Remove references to getID() in app-schema tutorial.
Merge branch 'master' of git://github.com/geoserver/geoserver