[PLAT-3781] and [PLAT-3378]: Provide example of calibration with prices using the new CalibrationEngine.
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into develop

Conflicts:
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/financial/interestrate/inflation/method/CapFloorYearOnYearCalibrationObjectiveTest.java
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into develop