Modifications to support updated XODB
Merge branch 'master' of ssh://au-bne-ds-001/home/developer/xodb

Conflicts:
	src/main/XODB.Import/common/DataModels/XODBImportModel.Context.cs
	src/main/XODB.Import/common/DataModels/XODBImportModel.Designer.cs
	src/main/XODB.Import/common/DataModels/XODBImportModel.edmx
	src/main/XODB.Import/common/DataModels/XODBImportModel.edmx.diagram
	src/main/XODB.Import/common/DataModels/X_DictionaryUnit.cs
	src/main/XODB.Import/common/DataModels/X_Project.cs
	src/main/XODB.Import/common/XODB.Import.csproj
Updates to add hint paths
Merge branch 'master' of ssh://au-bne-ds-001/home/developer/xodb
Mods to get projects compiling more easily
Merge branch 'master' of ssh://au-bne-ds-001/home/developer/xodb
Post merge modifications to import and projects