Added the coding style guidelines.
Merge branch 'release-demo2'
Fixed file headers.
Merge branch 'master' into develop