Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into ycastillo-yoselyn.7137
Merge datetime function calls changes - refs #7131
Merge pull request #300 from uppa/uppa.7155

Fixes #7155 : Exercice description bug
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Merge pull request #286 from emarguin/increase_memory_limit

increase memory limit (related to http://www.chamilo.org/phpBB3/viewtopi...
updating and tidy code, as well free notification sound #7147
changing chat colors to light colors
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Rename some variables - refs #6715
css scorm new #7141
Added partial translation to NL for Fckeditor terms
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x
Applying 7c9ea93ecdfdb9b75f3ccc09b48a796abe20a02a see BT#7975
Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19
Merge pull request #61 from chamilo/1.9.x

1.9.x
minor code format
Minor code format
Avoid headers in the layout when there is a modal - refs #7161
Adding adminer 4.1.0
Adding db manager configuration option.