Updated version number
Added version into name of desktop icon
moved build type back to DEVELOPMENT
Merge branch 'release-3.1.0' into develop