Adding ALL and NONE categories in course catalog -refs #6882
manual merge
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x