Merge pull request #18 from chamilo/1.9.x

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

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

1.9.x
fixing language in user import -refs #6783
Merge pull request #170 from ycastillo/6783

6783