Merge pull request #1516 from ssushma/dev-branch

Assignments UI
Assignments UI as is