display hours in agenda + tinymce4.0
Merge branch 'master' of https://github.com/claroline/Claroline