Merge pull request #33 from 52North/develop

merge development status to master
Merge pull request #35 from 52North/develop

Develop
[maven-release-plugin] prepare release sensorwebclient-3.2.0
Merge pull request #37 from 52North/develop

Develop
add empty line to test 52n-jenkins permissions
Merge branch 'master' of ssh://github.com/52North/SensorWebClient
Merge pull request #38 from 52North/master

merge
Revert "Merge pull request #38 from 52North/master"

This reverts commit 9631133fa5d394ebf38ddb3e42b52eb5f880bc91, reversing
changes made to e895f83a7f93462d050eb86ff43d2ada64ce6e83.
Merge pull request #39 from ridoo/master

merge 3.3 devs
Merge pull request #40 from ridoo/master

fix merge issues
Merge pull request #41 from ridoo/master

use cors filter by default (requires tomcat 7)
Merge pull request #42 from ridoo/master

add missing dependency
Merge pull request #43 from ridoo/master

progress in modularizing timeseries-web and timeseries-io
Merge pull request #44 from ridoo/master

fix test failures
Merge pull request #45 from ridoo/master

fixes for API v0 and sophisticated error management for v1
Merge pull request #46 from ridoo/master

merge changes regarding to REST-API
Merge pull request #48 from ridoo/master

work on REST API, incl. changes from @janschulte
Merge pull request #49 from ridoo/master

api doc, fixes
Merge pull request #50 from ridoo/master

filter on resources
add bar chart rendering