Merge remote-tracking branch 'dev-clone/master'
Merge remote-tracking branch 'dev-clone/master' into stacking3
Merge branch 'master' into stacking3
Merge branch 'master' into stacking3
Merge commit '4eb7f7c9143f41f273ff42ea0f2bce26888b19be' into reference-data-refactor

Conflicts:
	bin/logistics/data-upload.sh
	bin/scrubNexus
	buildtools/services/pom.xml
	config/common/ci/trafigura.properties
	config/common/pre-prod/trafigura.properties
	config/common/shared/components.rb
	config/common/shared/template.properties
	config/referencedata/integration/datasource.rb
	config/referencedata/integration/trafigura.properties
	config/referencedata/qa/trafigura.properties
	config/referencedata/rdstream-UAT-lviv/datasource.rb
	config/referencedata/rdstream-UAT-lviv/deploy.rb
	config/referencedata/rdstream-UAT-lviv/trafigura.properties
	config/referencedata/rdstream-qa-lviv/datasource.rb
	config/referencedata/rdstream-qa-lviv/deploy.rb
	config/referencedata/rdstream-qa-lviv/trafigura.properties
	config/referencedata/rdstream-showcase-lviv/datasource.rb
	config/referencedata/rdstream-showcase-lviv/deploy.rb
	config/referencedata/rdstream-showcase-lviv/trafigura.properties
	config/referencedata/showcase/trafigura.properties
	db/referencedata/locodes_small_sql/005_cr_a_loc.sql
	db/referencedata/locodes_small_sql/006_loc_small_merge.sql
	db/referencedata/very_all.sql
	desktop/Desktop.sln
	desktop/DesktopContainer/App.config
	desktop/DesktopContainer/Bootstrapper.cs
	desktop/DesktopContainer/TitanSplashscreen.psd
	desktop/Modules/ReferenceData/Banks/Repository/BanksRepository.cs
	desktop/Modules/ReferenceData/Banks/Views/BankSearchWindow.xaml
	desktop/Modules/ReferenceData/Banks/Views/DetailsView.xaml
	desktop/Modules/ReferenceData/Banks/Views/GridView.xaml
	desktop/Modules/ReferenceData/Banks/Views/GridView.xaml.cs
	desktop/Modules/ReferenceData/Books/Module.cs
	desktop/Modules/ReferenceData/Books/ViewModels/BooksVersionsViewModel.cs
	desktop/Modules/ReferenceData/Books/ViewModels/Interfaces/IBooksVersionsViewModel.cs
	desktop/Modules/ReferenceData/Books/Views/BooksVersionsView.xaml
	desktop/Modules/ReferenceData/Counterparties/Repository/CounterpartyRepository.cs
	desktop/Modules/ReferenceData/Counterparties/Views/CounterpartiesBankAccountsView.xaml
	desktop/Modules/ReferenceData/Counterparties/Views/CounterpartiesDetailView.xaml
	desktop/Modules/ReferenceData/Counterparties/Views/CounterpartiesGridView.xaml
	desktop/Modules/ReferenceData/Counterparties/Views/CounterpartiesGridView.xaml.cs
	desktop/Modules/ReferenceData/Counterparties/Views/CounterpartyNameView.xaml
	desktop/Modules/ReferenceData/Countries/Views/CountriesGridView.xaml
	desktop/Modules/ReferenceData/Countries/Views/CountriesGridView.xaml.cs
	desktop/Modules/ReferenceData/Departments/Views/DepartmentsGridView.xaml.cs
	desktop/Modules/ReferenceData/Exchanges/Views/DetailView.xaml
	desktop/Modules/ReferenceData/GroupCompanies/Model/GroupCompanyInfo.cs
	desktop/Modules/ReferenceData/GroupCompanies/Properties/Resources.Designer.cs
	desktop/Modules/ReferenceData/GroupCompanies/Properties/Resources.resx
	desktop/Modules/ReferenceData/GroupCompanies/Repository/GroupCompaniesRepository.cs
	desktop/Modules/ReferenceData/GroupCompanies/ViewModels/GroupCompaniesViewModel.cs
	desktop/Modules/ReferenceData/GroupCompanies/Views/GridView.xaml
	desktop/Modules/ReferenceData/GroupCompanies/Views/GridView.xaml.cs
	desktop/Modules/ReferenceData/GroupCompanies/Views/InterCompanyAccountsView.xaml
	desktop/Modules/ReferenceData/GroupCompanies/Views/RelatedGroupCompaniesView.xaml
	desktop/Modules/ReferenceData/GroupCompanies/Views/TaxCodesView.xaml
	desktop/Modules/ReferenceData/LegalEntities/Module.cs
	desktop/Modules/ReferenceData/LegalEntities/Repository/LegalEntitiesRepository.cs
	desktop/Modules/ReferenceData/LegalEntities/Views/DetailView.xaml
	desktop/Modules/ReferenceData/LegalEntities/Views/GridView.xaml
	desktop/Modules/ReferenceData/LegalEntities/Views/GridView.xaml.cs
	desktop/Modules/ReferenceData/Permissions/Repository/PermissionsRepository.cs
	desktop/Modules/ReferenceData/Permissions/Views/PermissionsGridView.xaml.cs
	desktop/Modules/ReferenceData/Restrictions/Model/RestrictionInfo.cs
	desktop/Modules/ReferenceData/Restrictions/ViewModels/RestrictionsGridViewModel.cs
	desktop/Modules/ReferenceData/Restrictions/Views/RestrictionsGridView.xaml.cs
	desktop/Modules/ReferenceData/Roles/Views/RolesAssociatedUsers.xaml
	desktop/Modules/ReferenceData/Roles/Views/RolesGridView.xaml.cs
	desktop/Modules/ReferenceData/Roles/Views/RolesPermissionsProcessesView.xaml
	desktop/Modules/ReferenceData/Shared/BasicEntities/UserBase.cs
	desktop/Modules/ReferenceData/Shared/Behaviors/CollectionColumnBehavior.cs
	desktop/Modules/ReferenceData/Shared/Controls/HistoryView.xaml.cs
	desktop/Modules/ReferenceData/Shared/Controls/Notes.xaml
	desktop/Modules/ReferenceData/Shared/Controls/Notes.xaml.cs
	desktop/Modules/ReferenceData/Shared/Entities/LegalEntityInfo.cs
	desktop/Modules/ReferenceData/Shared/Entities/ValidatableEntity.cs
	desktop/Modules/ReferenceData/Shared/Properties/Resources.Designer.cs
	desktop/Modules/ReferenceData/Shared/Properties/Resources.resx
	desktop/Modules/ReferenceData/Shared/Repositories/CommonRepository.cs
	desktop/Modules/ReferenceData/Shared/Trafigura.Modules.ReferenceData.Shared.csproj
	desktop/Modules/ReferenceData/Shared/Utils/ExcelExporter.cs
	desktop/Modules/ReferenceData/Shared/ViewModels/Interfaces/IUserNotesViewModel.cs
	desktop/Modules/ReferenceData/Shared/ViewModels/RefDataViewModel.cs
	desktop/Modules/ReferenceData/Shared/ViewModels/UserNotesViewModel.cs
	desktop/Modules/ReferenceData/Shared/ViewModels/ViewModelBase.cs
	desktop/Modules/ReferenceData/Shared/ViewModels/VirtualizedViewModelBase.cs
	desktop/Modules/ReferenceData/Shared/Views/AddressCardView.xaml
	desktop/Modules/ReferenceData/Shared/Views/BankAccountCardView.xaml
	desktop/Modules/ReferenceData/Shared/Views/ContactCardView.xaml
	desktop/Modules/ReferenceData/Shared/Virtualization/VirtualizableGridBehavior.cs
	desktop/Modules/ReferenceData/Users/Model/UserInfo.cs
	desktop/Modules/ReferenceData/Users/Repository/IUsersRepository.cs
	desktop/Modules/ReferenceData/Users/Repository/UsersRepository.cs
	desktop/Modules/ReferenceData/Users/Trafigura.Modules.ReferenceData.Users.csproj
	desktop/Modules/ReferenceData/Users/ViewModels/UsersViewModel.cs
	desktop/Modules/ReferenceData/Users/Views/UsersBooksView.xaml
	desktop/Modules/ReferenceData/Users/Views/UsersDetailsView.xaml
	desktop/Modules/ReferenceData/Users/Views/UsersGridView.xaml
	desktop/Modules/ReferenceData/Users/Views/UsersGridView.xaml.cs
	desktop/ReferenceData.sln
	desktop/UIShared/UIControls/Trafigura.UIShared.UIControls.csproj
	pom.xml
	services/referencedatanew/component-tests/src/test/scala/com/trafigura/referencedata/test/external/service/TestLegalEntitiesService.scala
	services/referencedatanew/component-tests/src/test/scala/com/trafigura/referencedata/test/service/TestLocationTypeService.scala
	services/referencedatanew/component-tests/src/test/scala/com/trafigura/referencedata/test/service/TestRegionsService.scala
	services/referencedatanew/functional-tests/pom.xml
	services/referencedatanew/functional-tests/src/test/resources/my_soapui_project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-accounting-public-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-books-private-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-departments-private-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-permissions-private-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-restrictions-private-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-roles-private-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-security-public-soapui-project.xml
	services/referencedatanew/functional-tests/src/test/resources/services-users-private-soapui-project.xml
	services/referencedatanew/service/.gitignore
	services/referencedatanew/service/pom.xml
	services/referencedatanew/service/src/main/resources/referencedata/dao.xml
	services/referencedatanew/service/src/main/resources/referencedata/scheduler.xml
	services/referencedatanew/service/src/main/resources/referencedata/services-private.xml
	services/referencedatanew/service/src/main/resources/trafigura.properties
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/BankAccountDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/BusinessLineDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/CommodityDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/CompanyDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/ContactDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/CountryDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/DepartmentDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/ExchangeDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/LocationDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/LogisticsLocationDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/LookupDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/RatingDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/StatusDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/company/LegalEntitiesSqlBuilder.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/company/ParentChildValidator.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/costcode/CoiGranularityDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/costcode/CoiTypeDao.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/dao/security/inner/users/hibernate/UsersDaoImpl.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/events/EventPublishingHibernateListener.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/external/provider/LegalEntitiesServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/external/provider/LocationsServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/external/provider/RatingsServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/external/transformer/ModelTransformer.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/AccountCodeTypeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/AddressTypeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/ApprovedStatusesServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/BankServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/BusinessLineServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/CompanyServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/ConcentrationLimitsServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/ContinentsServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/CountryServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/CurrenciesServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/DepartmentServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/ExchangeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/FontServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/GroupCompanyServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/HeaderFooterServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/InterestTypesServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LanguageServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LeBankFlagServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LeRoleServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LocationFunctionTypesServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LocationTypeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LookupServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/LookupTypeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/MonthServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/NoteServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/RatingsAgentsServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/RegistredOfficeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/SecuredServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/StatusServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/provider/VatCodeServiceProvider.scala
	services/referencedatanew/service/src/main/scala/com/trafigura/referencedata/util/ValidateHelper.scala
	services/referencedatanew/service/src/test/scala/com/trafigura/referencedata/dao/CompanyDaoTest.scala
	services/referencedatanew/service/src/test/scala/com/trafigura/referencedata/dao/LookupDaoTest.scala
	services/referencedatanew/service/src/test/scala/com/trafigura/referencedata/events/ReferenceDataEventsMock.scala
	services/starling/auth/jars/jna.jar
	services/starling/auth/jars/platform.jar
	services/starling/curves/jars/calculator.jar
	services/starling/curves/jars/jeksparser.jar
	services/starling/curves/jars/sources/jeks_1.0.2-src.zip
	services/starling/curves/src/starling/curves/CurveObject.scala
	services/starling/curves/src/starling/curves/DiscountCurve.scala
	services/starling/curves/src/starling/curves/Environment.scala
	services/starling/curves/src/starling/curves/FuturesCurve.scala
	services/starling/curves/src/starling/curves/HistoricFixings.scala
	services/starling/curves/src/starling/curves/OilAtmVolCurveKey.scala
	services/starling/curves/src/starling/curves/USDFXRate.scala
	services/starling/curves/src/starling/db/MarketDataReader.scala
	services/starling/curves/src/starling/market/Market.scala
	services/starling/curves/src/starling/market/formula/FormulaIndex.scala
	services/starling/curves/src/starling/marketdata/PriceFixingsHistoryData.scala
	services/starling/curves/src/starling/marketdata/VolSurfaceData.scala
	services/starling/curves/tests/starling/curves/EnvironmentTests.scala
	services/starling/databases/codegen.bat
	services/starling/databases/jars/bonecp-0.7.1.RELEASE.jar
	services/starling/databases/resources/Automation Template.xls
	services/starling/databases/resources/Reference Template.xls
	services/starling/databases/resources/var-email-template.html
	services/starling/databases/src/starling/LIMServer.scala
	services/starling/databases/src/starling/curves/readers/FwdCurveDbMarketDataSource.scala
	services/starling/databases/src/starling/curves/readers/LIBORFixings.scala
	services/starling/databases/src/starling/curves/readers/OilAndMetalsVARLimMarketDataSource.scala
	services/starling/databases/src/starling/db/MarketDataImporter.scala
	services/starling/databases/src/starling/db/MarketDataStore.scala
	services/starling/databases/src/starling/db/ReportingEntityID.scala
	services/starling/databases/src/starling/db/ResultSetRowFactoryTrait.scala
	services/starling/databases/src/starling/eai/EAIAutoImport.scala
	services/starling/databases/src/starling/eai/instrumentreaders/EAISystemOfRecord.scala
	services/starling/databases/src/starling/pivot/SQLPivotTableDataSource.scala
	services/starling/databases/src/starling/props/Props.scala
	services/starling/databases/src/starling/props/PropsHelper.scala
	services/starling/databases/src/starling/tradestore/TradeStore.scala
	services/starling/databases/src/starling/utils/sql/QueryBuilder.scala
	services/starling/databases/src/starling/utils/sql/SqlRenderer.scala
	services/starling/databases/test-resources/starling/curves/readers/Overnight_Fixing_Calendar_2011.txt
	services/starling/databases/test-resources/starling/curves/readers/Spot_Next_Fixing_Calendar_2011.txt
	services/starling/databases/tests/starling/curves/readers/LiborFixingTests.scala
	services/starling/databases/tests/starling/db/MarketDataImporterTests.scala
	services/starling/databases/tests/starling/db/MarketDataStoreTest.scala
	services/starling/databases/webstart/build_booter_jar
	services/starling/daterange/src/starling/daterange/Day.scala
	services/starling/daterange/src/starling/daterange/StoredFixingPeriod.scala
	services/starling/gui.api/src/starling/gui/api/EnvironmentRuleLabel.scala
	services/starling/gui.api/src/starling/gui/api/TradeReport.scala
	services/starling/gui/jars/sources/jxlayer-src.zip
	services/starling/gui/resources/icons/validation.png
	services/starling/gui/src/starling/gui/CannedLauncher.scala
	services/starling/gui/src/starling/gui/GuiUtils.scala
	services/starling/gui/src/starling/gui/Page.scala
	services/starling/gui/src/starling/gui/pages/AbstractPivotPage.scala
	services/starling/gui/src/starling/gui/pages/SaveLayoutPanel.scala
	services/starling/gui/src/starling/gui/pages/SingleTradePage.scala
	services/starling/gui/src/starling/pivot/view/swing/GuiFieldComponent.scala
	services/starling/gui/src/starling/pivot/view/swing/PivotJTableModelHelper.scala
	services/starling/gui/src/starling/pivot/view/swing/PivotTableView.scala
	services/starling/gui/src/starling/pivot/view/swing/PivotTableViewHelper.scala
	services/starling/gui/src/starling/pivot/view/swing/UnfrozenTableLayerUI.scala
	services/starling/instrument/jars/xstream-distribution-1.3.1-src.zip
	services/starling/instrument/src/starling/instrument/AsianOption.scala
	services/starling/instrument/src/starling/instrument/CFD.scala
	services/starling/instrument/src/starling/instrument/CashInstrument.scala
	services/starling/instrument/src/starling/instrument/CommoditySwap.scala
	services/starling/instrument/src/starling/instrument/Costs.scala
	services/starling/instrument/src/starling/instrument/FXForward.scala
	services/starling/instrument/src/starling/instrument/FuturesOption.scala
	services/starling/instrument/src/starling/instrument/Instrument.scala
	services/starling/instrument/src/starling/instrument/PnlExplanation.scala
	services/starling/instrument/src/starling/instrument/Tradeable.scala
	services/starling/instrument/src/starling/instrument/UTP_Portfolio.scala
	services/starling/instrument/src/starling/richdb/RichInstrumentResultSetRow.scala
	services/starling/instrument/tests/starling/instrument/AsianOptionTests.scala
	services/starling/instrument/tests/starling/instrument/CommoditySwapTests.scala
	services/starling/instrument/tests/starling/instrument/UTPTests.scala
	services/starling/lib/launch4j/launch4j
	services/starling/loopyxl/cs/LoopyXL.Test/DoubleMatrixMarshallerTest.cs
	services/starling/loopyxl/cs/LoopyXL.Test/DynamicMethodCreatorTest.cs
	services/starling/loopyxl/cs/LoopyXL.Test/LoopyXL.Test.csproj
	services/starling/loopyxl/cs/LoopyXL.Test/LoopyXL.dna
	services/starling/loopyxl/cs/LoopyXL.Test/LoopyXL.xll
	services/starling/loopyxl/cs/LoopyXL.Test/Properties/AssemblyInfo.cs
	services/starling/loopyxl/cs/LoopyXL.Test/ProtocolBufferTest.cs
	services/starling/loopyxl/cs/LoopyXL.Test/TestHelper.cs
	services/starling/loopyxl/cs/LoopyXL.Test/lib/Moq.dll
	services/starling/loopyxl/cs/LoopyXL.Test/lib/Moq.pdb
	services/starling/loopyxl/cs/LoopyXL.Test/lib/nunit.framework.dll
	services/starling/loopyxl/cs/LoopyXL.sln
	services/starling/loopyxl/cs/LoopyXL/CachingMethodProvider.cs
	services/starling/loopyxl/cs/LoopyXL/DnaMethodInfoRegistry.cs
	services/starling/loopyxl/cs/LoopyXL/DoubleMatrixMarshaller.cs
	services/starling/loopyxl/cs/LoopyXL/DynamicMethodImplementor.cs
	services/starling/loopyxl/cs/LoopyXL/ExcelDNAAppender.cs
	services/starling/loopyxl/cs/LoopyXL/IEnumerableExtensions.cs
	services/starling/loopyxl/cs/LoopyXL/LoopyXL.csproj
	services/starling/loopyxl/cs/LoopyXL/MarshallException.cs
	services/starling/loopyxl/cs/LoopyXL/Method.cs
	services/starling/loopyxl/cs/LoopyXL/MethodImplementor.cs
	services/starling/loopyxl/cs/LoopyXL/MethodInfoRegistry.cs
	services/starling/loopyxl/cs/LoopyXL/MethodInvoker.cs
	services/starling/loopyxl/cs/LoopyXL/MethodProvider.cs
	services/starling/loopyxl/cs/LoopyXL/MissingMethodInvoker.cs
	services/starling/loopyxl/cs/LoopyXL/ObjectExtensions.cs
	services/starling/loopyxl/cs/LoopyXL/PrefixingProtocolBuffer.cs
	services/starling/loopyxl/cs/LoopyXL/Properties/AssemblyInfo.cs
	services/starling/loopyxl/cs/LoopyXL/ProtocolBuffer.cs
	services/starling/loopyxl/cs/LoopyXL/ProtocolBufferMethodInvoker.cs
	services/starling/loopyxl/cs/LoopyXL/ProtocolBufferMethodProvider.cs
	services/starling/loopyxl/cs/LoopyXL/StaticMethodInvoker.cs
	services/starling/loopyxl/cs/LoopyXL/StreamSource.cs
	services/starling/loopyxl/cs/LoopyXL/TypeLookup.cs
	services/starling/loopyxl/cs/LoopyXL/lib/ExcelDna.Integration.dll
	services/starling/loopyxl/cs/LoopyXL/lib/Licence.txt
	services/starling/loopyxl/cs/LoopyXL/lib/common.xslt
	services/starling/loopyxl/cs/LoopyXL/lib/csharp.xslt
	services/starling/loopyxl/cs/LoopyXL/lib/descriptor.proto
	services/starling/loopyxl/cs/LoopyXL/lib/log4net.dll
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf-net.Extensions.XML
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf-net.Extensions.dll
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf-net.Extensions.pdb
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf-net.dll
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf-net.pdb
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf-net.xml
	services/starling/loopyxl/cs/LoopyXL/lib/protobuf_spike.jar
	services/starling/loopyxl/cs/LoopyXL/lib/protoc-license.txt
	services/starling/loopyxl/cs/LoopyXL/lib/protogen.pdb
	services/starling/loopyxl/cs/LoopyXL/lib/vb.xslt
	services/starling/loopyxl/cs/LoopyXL/lib/xml.xslt
	services/starling/loopyxl/cs/LoopyXL/loopyxl.cs
	services/starling/loopyxl/cs/LoopyXL/loopyxl.proto
	services/starling/loopyxl/src/loopyxl.proto
	services/starling/maths/jars/commons-math-2.1.jar
	services/starling/maths/jars/sources/commons-math-2.1-sources.jar
	services/starling/maths/src/starling/models/BlackScholes.scala
	services/starling/pivot/src/starling/pivot/MarketValue.scala
	services/starling/pivot/src/starling/pivot/PivotFieldsState.scala
	services/starling/pivot/src/starling/pivot/PivotTableDataSource.scala
	services/starling/pivot/src/starling/pivot/TableCell.scala
	services/starling/pivot/src/starling/pivot/controller/PivotGrid.scala
	services/starling/pivot/src/starling/pivot/controller/PivotTable.scala
	services/starling/pivot/src/starling/pivot/controller/PivotTableConverter.scala
	services/starling/pivot/tests/starling/pivot/AxisTreeTester.scala
	services/starling/pivot/tests/starling/pivot/ColumnStructureTest.scala
	services/starling/pivot/tests/starling/pivot/PivotFieldsStateTests.scala
	services/starling/project/build/Starling.scala
	services/starling/project/deployment/cap
	services/starling/project/deployment/install.sh
	services/starling/project/plugins/project/build.properties
	services/starling/quantity/src/starling/pivot/PivotQuantity.scala
	services/starling/quantity/src/starling/quantity/Quantity.scala
	services/starling/quantity/src/starling/utils/QuantityTestUtils.scala
	services/starling/quantity/tests/starling/quantity/QuantityTests.scala
	services/starling/sbt-teamcity-plugin/project/boot
	services/starling/sbt/sbt
	services/starling/sbt/sbt-launch.jar
	services/starling/services/src/starling/curves/DiscountCurveType.scala
	services/starling/services/src/starling/curves/EAIQuotesFormulaIndexReader.scala
	services/starling/services/src/starling/curves/EnvironmentRule.scala
	services/starling/services/src/starling/curves/ForwardFXCurveType.scala
	services/starling/services/src/starling/curves/ImpliedVolCurveTypeFactory.scala
	services/starling/services/src/starling/curves/PriceCurveViewerOutputsPivotTableDataSource.scala
	services/starling/services/src/starling/curves/PricingScheduleFactory.scala
	services/starling/services/src/starling/curves/SwapVolScheduleFactory.scala
	services/starling/services/src/starling/http/HttpServer.scala
	services/starling/services/src/starling/http/ReportServlet.scala
	services/starling/services/src/starling/reports/pivot/MarketChangesPnl.scala
	services/starling/services/src/starling/reports/pivot/MtmPivotReport.scala
	services/starling/services/src/starling/reports/pivot/PnLReconciliation.scala
	services/starling/services/src/starling/reports/pivot/TradeReconciliation.scala
	services/starling/services/src/starling/rmi/StarlingServerImpl.scala
	services/starling/services/src/starling/schemaevolution/xstream/MapBasedXStreamConverter.scala
	services/starling/services/src/starling/services/EmailBroadcaster.scala
	services/starling/services/src/starling/services/ReferenceData.scala
	services/starling/services/src/starling/services/Scheduler.scala
	services/starling/services/src/starling/services/Server.scala
	services/starling/services/src/starling/services/UploadCurveToTrinityTask.scala
	services/starling/services/src/starling/services/VerifyPriceAvailable.scala
	services/starling/services/src/starling/services/VerifyPricesValid.scala
	services/starling/services/src/starling/services/jmx/StarlingJMX.scala
	services/starling/services/src/starling/services/trade/ExcelTradesRange.scala
	services/starling/services/src/starling/utils/Regression-Jon
	services/starling/services/src/starling/utils/Regression-Seetal
	services/starling/services/src/starling/utils/RegressionRunner.scala
	services/starling/services/src/starling/utils/RepopulateMarketData.scala
	services/starling/services/tests/starling/reports/pivot/PnlExplanationReportTests.scala
	services/starling/services/tests/starling/reports/pivot/RiskPivotReportTests.scala
	services/starling/services/tests/starling/services/VerifyPricesValidTests.scala
	services/starling/teamcity.sh
	services/starling/trade/src/starling/trade/Trade.scala
	services/starling/utils/jars/commons-lang-2.3.jar
	services/starling/utils/jars/commons-pool-1.3.jar
	services/starling/utils/jars/dispatch-json_2.8.0-0.7.4.jar
	services/starling/utils/jars/sjson-0.8-2.8.0.jar
	services/starling/utils/jars/sources/spring-ldap-1.3.0.RELEASE-sources.jar
	services/starling/utils/jars/spring-ldap-1.3.0.RELEASE-all.jar
	services/starling/utils/src/starling/utils/HeterogeneousMap.scala
	services/starling/utils/src/starling/utils/RichString.scala
	services/starling/utils/src/starling/utils/StarlingEnum.scala
	services/starling/utils/src/starling/utils/Utils.scala
	services/starling/utils/src/starling/utils/conversions/RichEither.scala
	services/starling/utils/src/starling/utils/conversions/RichMap.scala
	services/starling/utils/src/starling/utils/conversions/RichOrdering.scala
	services/starling/utils/src/starling/utils/conversions/RichTraversable.scala
	services/tradeservice/service/src/main/sql/after/001-enable-users.sql
	shared/dotnet/Constants/ReferenceDataConstants.cs
Merge branch 'master' into starling
Merge branch 'trademgmt' into S-09222
Merge branch 'ci_sprint' into costsandincomes
Merge branch 'logistics' into S-08891
Merge branch 'logistics' into S-09038

Conflicts:
	desktop/Modules/Logistics/Quotas/View.xaml
	model/model/internal/types/logistics-inventory.rb
	services/logistics/service/src/main/resources/logistics.xml
	services/logistics/service/src/main/scala/com/trafigura/logistics/rpc/TradeEventHandler.scala
	services/logistics/service/src/test/scala/com/trafigura/logistics/rpc/TestQuotaAmendmentProcessor.scala
	services/logistics/service/src/test/scala/com/trafigura/logistics/rpc/TestTradeEventHandler.scala
Merge commit '8b1f2918998270f8e87f3e4bd92a84694051cd4e' into reference-data-refactor-lviv

Conflicts:
	services/referencedatanew/component-tests/src/test/scala/com/trafigura/referencedata/test/service/TestConcentrationLimitsService.scala
Merge branch 'logistics' into S-04300

Conflicts:

	desktop/Modules/Logistics/Movements/DetailsView.xaml
	desktop/Modules/Logistics/Movements/DetailsView.xaml.cs
	desktop/Modules/Logistics/Movements/ViewModels/MovementModel.cs
	desktop/Modules/Logistics/Shared/Model/MovementDetailWrapper.cs
	scenarios/OldScenarios/Steps/DataSteps.cs
	services/logistics/component-tests/src/test/scala/com/trafigura/logistics/rpc/LogisticsMovementsServiceRPC/TestMovementsServiceRPC.scala
	services/logistics/service/src/main/resources/persistence.xml
	services/logistics/service/src/main/scala/com/trafigura/logistics/dao/MovementDaoJpa.scala
	services/logistics/service/src/main/scala/com/trafigura/logistics/rpc/service/ServiceMovement.scala
	services/logistics/service/src/test/scala/com/trafigura/logistics/dao/TestMovementDaoJpa.scala
Weird merge error
Merge branch 'logistics' into S-09300

Conflicts:
	desktop/Modules/Logistics/Movements.Tests/ViewModels/MovementModelTest.cs
	desktop/Modules/Logistics/Movements/ViewModels/MovementModel.cs
	desktop/Modules/Logistics/Shared/Model/AbstractMovementWrapper.cs
	services/logistics/component-tests/src/test/scala/com/trafigura/logistics/rpc/LogisticsMovementsServiceRPC/TestMovementsServiceRPC.scala
Merge commit '364f8d5961928c1381cae204bfae2233627ef512' into S-07212-2

Conflicts:
	services/bankstatement/service/src/main/resources/persistence.xml
	services/securitisation/service/src/main/resources/securitisation-service.xml
	services/securitisation/service/src/main/scala/com/trafigura/sec/process/PayableRetrievalService.java
	services/securitisation/service/src/test/scala/com/trafigura/sec/process/PayableRetrievalServiceTest.java
	services/shared/titan-security/src/main/resources/system-users.xml
Merge branch 'trademgmt' into S-09545
Merge branch 'logistics' into S-09300

Conflicts:
	desktop/Modules/Logistics/Movements/DetailsView.xaml
	desktop/Modules/Logistics/Shared/Model/MovementDetailWrapper.cs
	desktop/Modules/Logistics/Shared/Properties/Resources.resx
	scenarios/OldScenarios/Steps/DataSteps.cs
Merge branch 'ci_sprint' into ci_nsmf

Conflicts:
	services/costsandincomes/service/src/main/scala/com/trafigura/costsandincomes/events/LogisticsEventProcessor.scala
	services/costsandincomes/service/src/main/scala/com/trafigura/costsandincomes/persistence/CostDAO.scala
Merge branch 'S-09224' of git2:dev into S-09224
Merge commit '2f94a9481437a969164b004eb0db6d0eb12ced67' into S-07212-2

Conflicts:
	model/model/securitisation/database/securitisation-edm-model.rb
	services/matching/service/src/test/scala/com/trafigura/securitisation/matching/learned/LearnedMatchingManagerTest.java
	services/matching/service/src/test/scala/com/trafigura/securitisation/matching/service/MatchingServiceLocalTest.java
	services/matching/service/src/test/scala/com/trafigura/securitisation/matching/service/MatchingServiceTest.java