Merge pull request #620 from solispauwels/master

git ignore ldap config file
Update composer.json.dist
Update composer.json.dist
Update composer.json.dist
Authentication update
Merge remote-tracking branch 'upstream/master'