Merge pull request #1 from chamilo/master

Update Chamilo