interim towards module restructuring
Merge branch 'fixhead' of https://github.com/cotrix/cotrixrep.git into
fixhead

Conflicts:
	cotrix/cotrix-web-parent/pom.xml