Reordering assignment with in the unit issue rectified.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1832 from VinRudramurthy/dev-branch

Reordering assignment with in the unit issue rectified.