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
refactoring cell menu hiding logic
Merge branch 'develop' into ui/dev
typo
change histogram bucket sizes
better positioning and styling of histogram controls
Merge branch 'develop' into ui/dev
bugfix for datasource dropdown breaking out of container
PLAT-3322 - Mirror ivy changes into maven pom files to allow maven compilation
Add option to specify output portfolio name in multi-aggregator
[PLAT-3385] Implemented more of the HistoricalTimeSeriesSource interface,
and added more Javadocs on the limitations and potential use case.
[PLAT-3386] Binary Sort in Piecewise Polynomial Interpolator
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into develop
fix for displaying context menu in inplace gadget
removed added return statement
readded return statement
fixing windows BAT scripts
Adding more instrument types to the curve node id mapper