Merge pull request #1933 from suryanarayanakb/dev-branch

Handling the unit navigation
Personalize button disabled for student view
Merge pull request #1942 from ssushma/dev-branch

Personalize button disabled for student view
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch