upgrade version
Merge branch 'master' of
https://github.com/scorpiopapa/joinway-framework.git

Conflicts:
	app/pom.xml
	appx/pom.xml
	beans/pom.xml
	cobot/pom.xml
	net/pom.xml
	pom.xml
	utils/pom.xml
	web/pom.xml