Merge
Merge branch 'master' of ssh://au-bne-ds-001/home/developer/xodb

Conflicts:
	src/main/XODB.Orchard/src/Orchard.Web/Modules/XODB/XODB.csproj.user
Updates to lithology import to fix issues with text data columns