Merge pull request #1620 from ssushma/dev-branch

unit setup number style set
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch