Whitespace-fixed all C++ files
Indent. fix, other files
Merge branch 'new-indentation-rule'

Indentation now with only 4 whitespaces