add WFS output, remove separate JSON output rempved, some bugfixes. Still work todo :)
Merge branch 'tjs_2.2.x' of https://github.com/thijsbrentjens/geoserver into tjs_2.2.x