Added: copyright headers.
Merge branch 'master' into dev