Changed the license to CC SA
Merge remote-tracking branch 'origin/master'