Documentation update
Merge remote-tracking branch 'upstream/master'
Merge pull request #449 from solispauwels/master

Documentation update
Merge branch 'master' of https://github.com/claroline/Claroline