Increment the version number in the settings file
Merge branch 'dev'