Merge branch 'bugfix-VersionDesc'
fix build version number
Merge branch 'hotfix-buildVersion' into develop