AllPlayers/brochure.allplayers.com — pull request #45 by loganbfisher (2013-01-31 15:31:04+00:00)
Title: [#43565463] fixed merge conflicts in feature navigation

Fixed the feature navigation merge conflicts that were found when trying to merge to prod.