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-3375] Upgraded to slf4j 1.7.5 and logback 1.0.11.
Remove unused field.
[PLAT-3398] Correct composition of aggregation property
Iterating through calc configs and then targets is more efficient.
Use common "housekeeping" thread instead of creating two dedicated timers for the holiday source.
Mark a "warn" level when an exception is reported. Produce verbose text for missing inputs and outputs when in FULL mode.
Merge branch 'develop' into ui/dev
Merge branch 'develop' into ui/dev
moving grid to new namespace
moving grid to new namespace
REVIEW comment about a log level that is probably inappropriate.
Merge branch 'develop' into ui/dev
Fix NPE in CurveNodeIdMapper fudge builder
More work on new curve configurations
Fix test - the expected object should have WARN set following recent change.
Better handling of boxed null in parameter type conversions.
Don't key mapped converters on default values.
Avoid NPE when invalid portfolio identifier is given.
Missed a file from previous commit.