Merge pull request #618 from ssushma/dev-branch

Changes for classpage home page implemented.
Merge pull request #619 from ssushma/dev-branch

Message properties conflits resolved
Fixed null pointer exception.
Merge pull request #621 from anilgooru/dev-branch

Fixed null pointer exception.
Changes for the drop menu new sort option implemented in Teach mode.