update app version
Merge branch 'develop' into feature/add_properties_to_tank

Conflicts:
	.gitignore
	pom.xml