Copyright header and class javadoc normalisation
Merge remote-tracking branch 'origin/master'