Merge branch 'develop' into ui/dev
Merge branch 'ui/dev' of github.com:OpenGamma/OG-Platform into ui/dev