edx/edx-platform — pull request #4265 by mlkwaqas (2014-07-01 13:19:28+00:00)
Title: Resolve the category subcategory navigation conflicts

FOR-123