Correct version number format
Merge branch 'development'
Update master version number
Update development version number