Add licensing information
Fixed licensing tags
Merge remote-tracking branch 'origin/master' into next