PLAT-3901 - Code style settings for IntelliJ
Merge branch 'dev/v2.0.x' of github.com:OpenGamma/OG-Platform into dev/v2.0.x