Increment the version number in the settings.py template
Merge branch 'dev'