Merge pull request #62 from chamilo/1.9.x

1.9.x
Adding Expiry date to user import functionality -refs #6839
Adding Expiry date to user import functionality -refs #6839
expiryDate to the end of the list -refs #6838
Merge pull request #331 from ycastillo/yoselyn.6838

Yoselyn.6838