merge
Merge branch 'master' of https://github.com/cotrix/cotrixrep.git

Conflicts:
	cotrix/cotrix-io/pom.xml
connected with publish service