Merge pull request #1 from terro/master

added ldap authentication
Update README.md
Merge remote-tracking branch 'upstream/master'