Changes for class setup implemented
conflicts resolved changes for class setup implemented
Merge pull request #1726 from ssushma/dev-branch

Changes for classpage implemented