UnitSetup ui modified.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1592 from mitraj/dev-branch

UnitSetup ui modified.