Merge branch 'develop'
Updated version number
Merge branch 'hotfix' into develop