edx/edx-platform — pull request #4263 by mlkwaqas (2014-07-01 12:19:37+00:00)
Title: Fix the category subcategory navigation conflicts

FOR-123