Merge branch 'master' of https://github.com/tauthement/HelpdeskAPI

Conflicts:
	.gitignore
Try #2: remove ldapauth.php
Merge branch 'master' of https://github.com/tauthement/HelpdeskAPI