"Save and Cancel Button changes implemented for reorder popup in class setup view."
"New css bundle added in class setup page"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1614 from sravanthi1/dev-branch

"Save and Cancel Button changes added for reorder popup"