Merge pull request #217 from solispauwels/master

TinyMCE update (include videos and audios by the resource picker)
Merge pull request #220 from solispauwels/master

fixes claroline/claroline#399
Merge remote-tracking branch 'upstream/master'