gxt version
Merge branch 'master' of https://github.com/biosemantics/etc-site.git

Conflicts:
	pom.xml