Merge branch 'master' into unstable
Better License file.
On branch unstable
Changes to be committed:
modified:   LICENSE
Merge branch 'unstable'