Fix id displayed in the options list - refs BT#8566
Add filter by branch - refs BT#8566
Merge branch '8566' of github.com:AngelFQC/chamilo-lms-icpna into 8566