fix bug
version up

Conflicts:
	pom.xml