add category resource
add categorie count to resources
add categorie count to service information
Merge
fixed #56
merge feature branches.

Conflicts:
	sensorwebclient-sos-rest/src/main/java/org/n52/api/v1/io/ServiceConverter.java
	timeseries-io/src/main/java/org/n52/io/v1/data/ServiceOutput.java
	timeseries-web/src/main/java/org/n52/web/v1/ctrl/TimeseriesDataController.java
use different output format for raw data