Rename
new file
New case.
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into develop

Conflicts:
	projects/OG-TimeSeries/og-timeseries.iml