exception handler via controllers, line rendering in timseries-io module
Merge branch 'master' of ssh://git@github.com/ridoo/SensorWebClient.git

Conflicts:
	timeseries-io/src/main/java/org/n52/io/render/RenderingContext.java