commit to pull
Merge remote branch 'refs/remotes/origin/develop' into develop

Conflicts:
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/math/interpolation/MonotoneConvexSplineInterpolatorTest.java
Merge remote branch 'refs/remotes/origin/develop' into develop

Conflicts:
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/math/interpolation/MonotoneConvexSplineInterpolatorTest.java
[PLAT-3306], [PLAT-3309] still some clean up to do
Merge remote branch 'refs/remotes/origin/develop' into develop

Conflicts:
	projects/OG-Analytics/src/test/java/com/opengamma/analytics/math/interpolation/MonotoneConvexSplineInterpolatorTest.java
[PLAT-3400] Very basic wrapper - node sensitivity, differentials and integrals unavailable
Merge remote branch 'refs/remotes/origin/develop' into develop
Merge remote branch 'refs/remotes/origin/develop' into develop
fix deletion of flat interpolator
Take out prints