Merge pull request #70 from ridoo/master

merge current updates
Merge pull request #72 from ridoo/master

hotfix for #71
Merge branch 'develop' of https://github.com/52North/SensorWebClient
into develop

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
Merge pull request #73 from ridoo/master

merge feature branches to main branch
Merge branch 'develop' of https://github.com/52North/SensorWebClient
into develop

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
add search functionality, fixed #63
merge search feature