Changed the header in some source code files. Clarifying the origin of the code.
Merge branch 'master' into ubuntu