use fixed version
update ignores
adjust version number
Add deleted property to ObservationREsource mapping file and add getter/setter to ObservationEntity.
Fix maven repos for geotools
Merge pull request #79 from CarstenHollmann/fix/add_deleted_property

Add deleted property to ObservationResource mapping file
Merge pull request #80 from CarstenHollmann/fix/geotools_repo

Fix maven repositories for geotools
move config files to example webapp. closes #71
Merge remote-tracking branch '52n/develop' into develop
Merge commit '5ed3e51debbd66e33226bd0d06b67205d8402ffe'

Conflicts:
	pom.xml
	timeseries-io/pom.xml
	timeseries-spi-impl/pom.xml
	timeseries-spi-impl/sos-series-dao/pom.xml
	timeseries-spi/pom.xml
	timeseries-web/pom.xml
	timeseries-webapp/pom.xml
reorder build plugins
adjust version-info.txt to filter version control properties correctly
update generated file
add linebreaks
Merge pull request #82 from ridoo/develop

release preparation
reorder release plugin
Merge pull request #83 from ridoo/develop

reorder release plugin
[maven-release-plugin] prepare release 1.2.2
[maven-release-plugin] prepare for next development iteration
Merge branch 'versions/v1.2.2'

Conflicts:
	pom.xml