added cotrix-import and new cotrix-tabular
Merge branch 'master' of https://github.com/cotrix/cotrixrep

Conflicts:
	cotrix/pom.xml