Merge branch 'master' into dev
renaming the edition
Merge branch 'dev'