Remove trailing whitespace - all files
resolving conflict involving whitespace removal
Merge branch 'whitespace' into staging