modify License
Merge branch '2.2/master' of github.com:domtancredi/scrip.it into 2.2/master