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 #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