Merge pull request #14 from chamilo/1.9.x

1.9.x
Merge pull request #15 from chamilo/1.9.x

1.9.x
fixing move folders -refs #6706
Merge pull request #160 from ycastillo/6706

6706