Merge branch 'master' into wps_10
EOxC: updating the JSON view.
Id2Path: fixing a typo + minor edit.
Changing layout of the GetFeatureInfo tepmlates.
Making the WPS enabled by default.
Changing wording of the description.
Making the WPS procesess enabled by default.
Making the test process disabled by default.
Merge branch 'master' into wps_10
Merge branch 'master' of github.com:DREAM-ODA-OS/eoxserver
Merge remote-tracking branch 'upstream/wps_10'

Conflicts:
	eoxserver/services/ows/wps/processes/test.py