fix license headers
Merge branch 'license_fixes'