Change license to GPL v3
Merge branch 'master' into dev