Merge branch 'master' into develop
Updated Transifex config
Merge branch 'develop'