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-3322] Upgrade the Jedis dependency back from UtilDB to Util.
Improved an error message found while working on PLAT-3322.
Throw a NullPointerException giving the specific detail on the underlying
security that could not be found.
Found while working on PLAT-3322, but is otherwise unrelated.
[PLAT-3322] A version of a RedisCachingSecuritySource that can be used
to cache lookups by UniqueId. It turns out that this is seldom actually
done, so is of limited value until other caching options are employed.
Modified Javadocs for SourceWithExternalBundle<> to explicitly state the
behavior of external ID searching.
(Agreed in internal HipChat discussion on 2014-04-18).
[PLAT-3322] Further implementation on the RedisCachingSecuritySource.
Not yet production ready.
refactoring cell menu hiding logic
reverting change to hide errors.
Merge branch 'develop' into ui/dev
timeseriesresolverkeys rest api wrapper
GUI-101 - Allow new data gadget to accept REST API-based data
clicking anywhere on the search results in view definition now removes/hides tooltip
[GUI-227] Column type for inline 1D matrix columns
[PLAT-2586] Created the three versions of Arithmetic average ON rate coupons.
removed incorrect placeholder swaption name
better cds option naming
editing a trade does not overwrite the existing name