Fixing typo
Fix typo in previous commit - see https://github.com/chamilo/chamilo-lms/commit/af3de2fbe0cb0080c279a8d9ab6ccb139054ce29#commitcomment-3249749 - refs #5563
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
hidding foder ou users 5555
New Add friends 6015
Merge pull request #53 from ycastillo/6015.new

New Add friends - refs #6015
Merge pull request #51 from ycastillo/documents

hidding foder ou users - refs #5555
merging
fix merge
changes in style and lang vars 2238
changes in style and lang vars 2238
changes in style and lang vars 2238
changes in style and lang vars 2238
style changes in add friends 6015
Fix issue preventing the correct opening of the learning path in student view - refs #6154 refs #5855
Updated translations
removing hidden overflow 6150
Merge pull request #55 from ycastillo/6015.new

style changes in adding friends - refs #6015
Merge pull request #56 from ycastillo/6150

removing hidden overflow - refs #6150
Fixed little conflict before merge