Merge branch 'hotfix/v2.0.3' into develop
Merge branch 'develop' of github.com:voxe/voxe-web into develop