Change versioning
Merge branch 'master' of github.com:kiselev-dv/osm-doc

Conflicts:
	pom.xml