cotrix proto-root now staged in repository at startup
Merge branch 'dev' of https://github.com/cotrix/cotrixrep.git into dev

Conflicts:
	cotrix/cotrix-head/.settings/org.eclipse.m2e.core.prefs