license added for some file
Merge branch 'v3.1' into v3.1copy