prepare next release
Merge branch 'master' of https://github.com/kiselev-dv/osm-doc-java

Conflicts:
	pom.xml