Whitespace changes

Git insists that there are changes to this file, but none are shown
when ignoring whitespace. And no git command I try will discard
the changes it thinks exist.
Merge branch 'dev'

Conflicts:
	CtcApi.Ods/Data/OdsRepository.cs