maxNumberOfFeaturesForPreview added to WFSAdminPage and MapPreviewPage
Added backport for maxNumberOfFeaturesForPreview
Merge branch 'master' of https://github.com/tbarsballe/geoserver into tbarsballe-previewmaxfeatures
Merge branch 'backport-previewmaxfeatures' into tbarsballe-backport-previewmaxfeatures

Conflicts:
	src/web/demo/src/main/java/org/geoserver/web/demo/MapPreviewPage.java
	src/wfs/src/main/java/org/geoserver/wfs/WFSInfoImpl.java
Fixed backport for maxNumberOfFeaturesForPreview
Merge branch 'master' of https://github.com/geoserver/geoserver into tbarsballe-backport-previewmaxfeatures
Removed merged data that should not have been merged
Merge branch 'tbarsballe-backport-previewmaxfeatures' of https://github.com/travislbrundage/geoserver into travislbrundage-tbarsballe-backport-previewmaxfeatures
Merge branch 'travislbrundage-tbarsballe-backport-previewmaxfeatures' into mf-wfs
Merging metadata modifications