CDS display tweak
Added hack to allow Excel to access combined data sources.
Make PositionMaster extend AbstractChangeProvidingMaster<PositionDocument> rather than
AbstractMaster<PositionDocument> and ChangeProvider
Merge branch 'develop' into ui/dev