Merge branch 'master' into 52n_master
Merge commit '2cf9d6987c9e82f14f1a6df7a91be054f066c2e0' into 52n_master
increase version
Merge branch '1.1.0-release' into master-52n
show timezone on timeaxis (currently not the correct one ... see corresponding test case)
ignore observation entries marked as 'deleted', closes #73
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
Merge pull request #76 from ridoo/master

release version 1.2.0
Merge remote-tracking branch '52n/develop' into 52n/master

Conflicts:
	pom.xml
	timeseries-io/pom.xml
	timeseries-web/pom.xml
use somewhat higher geotools version as 8.2 pom.xml became somhow invalid
increase version for next development phase
change version
change version
Merge branch 'versions/v1.2.0'
make SOS dependency stable