API changes for master
new master's API
Merge branch 'develop' into topic/masters
Merge branch 'develop' into topic/masters
fixing DbUserMaster
new change manager
Merge commit 'beab27de169033d9323e36cad0b5136f1bc30dc6' into merging_with_develop

Conflicts:
	projects/OG-Bloomberg/src/com/opengamma/bbg/BloombergSecuritySource.java
	projects/OG-Bloomberg/src/com/opengamma/bbg/loader/BloombergHistoricalTimeSeriesLoader.java
	projects/OG-Bloomberg/tests/unit/com/opengamma/bbg/RemoteBloombergSecuritySourceWithActiveMQTest.java
	projects/OG-Bloomberg/tests/unit/com/opengamma/bbg/security/BloombergSecurityProviderTest.java
	projects/OG-BloombergExample/config/fullstack/fullstack-bloombergexample-viewprocessor-spring.xml
	projects/OG-BloombergExample/src/com/opengamma/bloombergexample/loader/ExampleTimeSeriesRatingLoader.java
	projects/OG-Component/src/com/opengamma/component/factory/web/WebsiteViewportsComponentFactory.java
	projects/OG-Core/src/com/opengamma/core/config/impl/EHCachingConfigSource.java
	projects/OG-Engine/src/com/opengamma/engine/marketdata/historical/AbstractHistoricalMarketDataProvider.java
	projects/OG-Examples/src/com/opengamma/examples/loader/ExampleTimeSeriesRatingLoader.java
	projects/OG-Examples/src/com/opengamma/examples/tool/ExampleDatabasePopulator.java
	projects/OG-Financial/src/com/opengamma/financial/analytics/forwardcurve/FXForwardCurveConfigPopulator.java
	projects/OG-Integration/src/com/opengamma/integration/copier/portfolio/rowparser/ExchangeTradedRowParser.java
	projects/OG-Integration/src/com/opengamma/integration/copier/portfolio/writer/MasterPortfolioWriter.java
	projects/OG-Language/Client/src/com/opengamma/language/view/ViewIdFunction.java
	projects/OG-Master/src/com/opengamma/master/config/impl/InMemoryConfigMaster.java
	projects/OG-Master/src/com/opengamma/master/exchange/impl/InMemoryExchangeMaster.java
	projects/OG-Master/src/com/opengamma/master/historicaltimeseries/impl/MasterHistoricalTimeSeriesSource.java
	projects/OG-Master/src/com/opengamma/master/marketdatasnapshot/impl/InMemorySnapshotMaster.java
	projects/OG-Master/src/com/opengamma/master/position/impl/InMemoryPositionMaster.java
	projects/OG-Master/src/com/opengamma/master/region/RegionSearchResult.java
	projects/OG-Master/src/com/opengamma/master/user/UserDocument.java
	projects/OG-Master/src/com/opengamma/master/user/UserSearchRequest.java
	projects/OG-Master/src/com/opengamma/master/user/UserSearchResult.java
	projects/OG-Master/src/com/opengamma/master/user/impl/InMemoryUserMaster.java
	projects/OG-Master/src/com/opengamma/master/user/impl/MasterUserSource.java
	projects/OG-MasterDB/src/com/opengamma/masterdb/config/DbConfigMaster.java
	projects/OG-MasterDB/src/com/opengamma/masterdb/config/DbConfigWorker.java
	projects/OG-MasterDB/src/com/opengamma/masterdb/historicaltimeseries/DbHistoricalTimeSeriesMaster.java
	projects/OG-MasterDB/src/com/opengamma/masterdb/user/DbUserMaster.java
	projects/OG-MasterDB/tests/unit/com/opengamma/masterdb/user/DbUserMasterTest.java
	projects/OG-Util/src/com/opengamma/util/ehcache/EHCacheUtils.java
	projects/OG-Web/src/com/opengamma/web/security/WebSecurityResource.java
	projects/OG-Web/src/com/opengamma/web/server/push/grid/PushLiveResultsService.java
	projects/OG-Web/tests/unit/com/opengamma/web/server/push/RestEntitySubscriptionTest.java
	projects/OG-Web/tests/unit/com/opengamma/web/server/push/ViewDefinitionEntriesResourceTest.java
fixup after merge
Merge branch 'develop' into topic/new_change_manager

Conflicts:
	projects/OG-BloombergExample/src/com/opengamma/bloombergexample/loader/CurveNodeHistoricalDataLoader.java
	projects/OG-Financial/src/com/opengamma/financial/view/ConfigDbViewDefinitionRepository.java
	projects/OG-Integration/src/com/opengamma/integration/tool/marketdata/CurveHtsResolverTool.java
	projects/OG-Integration/src/com/opengamma/integration/tool/marketdata/MarketDataSnapshotTool.java
	projects/OG-Master/src/com/opengamma/master/config/ConfigSearchResult.java
	projects/OG-Master/src/com/opengamma/master/config/impl/InMemoryConfigMaster.java
	projects/OG-Web/src/com/opengamma/web/server/push/rest/TimeSeriesResolverKeysResource.java
Merge remote-tracking branch 'origin/develop' into develop