Add licensing information for the clockworks library
Update changelog
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Remove french2 erroneous upload
Merge branch 'C7347' of github.com:aragonc/chamilo-lms into C7347
update