don't know about this one.
Merge branch 'master' of git@github.com:ariesteam/aries.git

Conflicts:
	plugins/org.integratedmodelling.aries.administration/etc/catalog/Geoserver_REST_database.xls