[PLAT-6345] Adding more outputs for equity and bond TRS

Conflicts:
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/BondTotalReturnSwapPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/historical/normalization/ExampleHistoricalTimeSeriesFieldAdjustmentMapFactoryBean.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleUgandanBondCurveConfigurationsPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleViewsPopulator.java
	examples/examples-simulated/src/main/resources/com/opengamma/examples/simulated/historical/historical-data.csv
	examples/examples-simulated/src/main/resources/com/opengamma/examples/simulated/livedata/market-data.csv
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/equity/EqyTrsPresentValueCalculator.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/interestrate/bond/calculator/BondTrsPresentValueCalculator.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/ModelFunctions.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/BondTotalReturnSwapFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/BondTotalReturnSwapPVFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapAssetLegPVFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapConstantSpreadThetaFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapFundingLegDetailsFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapFundingLegPVFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapGammaPV01Function.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapPV01Function.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapPVFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapValueDeltaFunction.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/TotalReturnSwapFunctions.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/TotalReturnSwapUtils.java
Revert "Revert "[PLAT-5345] Adding bond TRS analytics to examples-simulated""

This reverts commit 9d135ecb6593985a0473de9e6759f70cfe4652aa.

Conflicts:
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/convention/ExampleUSConventions.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/convention/SyntheticInMemoryConventionMasterInitializer.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/BondTotalReturnSwapPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/EquityTotalReturnSwapPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/IndexPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/historical/normalization/ExampleHistoricalTimeSeriesFieldAdjustmentMapFactoryBean.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleCurveConfigurationsPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleExposureFunctionConfigPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleViewsPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/tool/ExampleDatabasePopulator.java
	examples/examples-simulated/src/main/resources/com/opengamma/examples/simulated/historical/historical-data.csv
	examples/examples-simulated/src/main/resources/com/opengamma/examples/simulated/livedata/market-data.csv
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/equity/EqyTrsPresentValueCalculator.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/horizon/EqyTrsConstantSpreadHorizonCalculator.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/BondTotalReturnSwapSecurityConverter.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/EquityTotalReturnSwapSecurityConverter.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/FixedIncomeConverterDataProvider.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/EquityTotalReturnSwapPV01Function.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/trs/TotalReturnSwapFunctions.java
Revert "Revert "[PLAT-6098], [PLAT-6099], [PLAT-6344], [PLAT-6345] Adding support for equity and bond TRS""

This reverts commit fa0605d9e1f26e67b1b493f2e99a59a1600154b8.

Conflicts:
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/convention/ExampleUSConventions.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/convention/SyntheticInMemoryConventionMasterInitializer.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/BondTotalReturnSwapPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/EquityTotalReturnSwapPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/generator/IndexPortfolioGeneratorTool.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleCurveConfigurationsPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleExposureFunctionConfigPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleUgandanBondCurveConfigurationsPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/loader/ExampleViewsPopulator.java
	examples/examples-simulated/src/main/java/com/opengamma/examples/simulated/tool/ExampleDatabasePopulator.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/equity/EqyTrsPresentValueCalculator.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/horizon/EqyTrsConstantSpreadHorizonCalculator.java
	projects/OG-Analytics/src/main/java/com/opengamma/analytics/financial/interestrate/bond/calculator/BondTrsPresentValueCalculator.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/BondTotalReturnSwapSecurityConverter.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/EquityTotalReturnSwapSecurityConverter.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/FixedIncomeConverterDataProvider.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/conversion/InterestRateSwapSecurityConverter.java
	projects/OG-Financial/src/main/java/com/opengamma/financial/analytics/model/ModelFunctions.java
[PLAT-6345] Regenerating joda-beans
Fixing merge problems
Completing merge