Merge pull request #1442 from ssushma/dev-branch

Grades in Folder updated.
accommodating lifeboard on dropmenu height increased in FE