Update pom.xml
Update pom.xml
Update pom.xml
Merge branch 'develop' into release-0_0_1

Conflicts:
	pom.xml