ignore .htaccess file
retry merging
Fixing images paths
Moving images.
Fixing admin link.
Partial merge with 19x
Removing main/conference see #6713
Removing main/portfolio see #6713
Updating from 1.9.x
Removing unused timeline tool.
Minor - format code.
Updating from sandbox
Fixing fatal errors.
Fixing message preview.
Adding tool services.
Merge pull request #310 from code-couleurs/master

ignore .htaccess file
Removing WCAG see #6713
Merging from 19x
Updating tools files + adding license.
Merge branch 'master' of ssh://github.com/chamilo/chamilo-lms