Merge pull request #6 from chamilo/1.9.x

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

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

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

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

1.9.x
set default option to All -refs #6312
Merge pull request #136 from ycastillo/yoselyn.new.6312

Yoselyn.new.6312