change license to Apache
Merge remote-tracking branch 'origin/master'