Merge branch 'master' into 52n_master
Merge commit '2cf9d6987c9e82f14f1a6df7a91be054f066c2e0' into 52n_master
increase version
Merge branch '1.1.0-release' into master-52n
Merge pull request #70 from CarstenHollmann/develop

Update SOS version to 4.1.0-SNAPSHOT
add tests and update docu
show timezone on timeaxis (currently not the correct one ... see corresponding test case)
Merge remote-tracking branch '52n/develop'
Do not recreate and override session holder instance for each new
instance. closes #72
ignore observation entries marked as 'deleted', closes #73
* add extension mechanism to timeseries metadata
* resultTime extension
* additional resultTime option in getData for timeseries
refactoring and adding configuration
Merge pull request #74 from janschulte/metadataExtension

Metadata extension
add new flot chart formatter
Merge pull request #75 from janschulte/develop

add new flot chart formatter
fix license header
Merge remote-tracking branch '52n/develop'
Merge branch 'master' into fixes/#69_timezone-issue
add missing license header
increase version