Performed automatic clean up and updated to CB 1.6.4 R2.0

(CR+LF line endings to LF) (tabs to spaces) (final where possible) (Add override annotations)

NOTE: It might look like a wall of pink, but that is because of the changed line endings and tabs to spaces.