Bumps version
Merge branch 'develop'
Merge branch 'develop'
Fixes build number