Merge pull request #615 from solispauwels/ldap

close claroline/Claroline#603
Merge remote-tracking branch 'upstream/master'