add release plugin
Merge origin/master

Conflicts:
	pom.xml
fix pom