Changing wordwrap parameter to 120
Minor - removing whitespaces
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into julio6666
Adding username as a paremeter to the password meter see BT#6487