remove trailing whitespaces & fix code highlight
Merge remote-tracking branch 'upstream/master' into format
Merge pull request #13 from eclipselu/format

remove trailing whitespaces & fix code highlight