Coding Style Fix
Test Class Fix
Style Fix
Coding Style
Category Manager Test Class
Coding Style
Merge pull request #2758 from puneet0191/staging

Selenium, System Test Fix