add ldap
Merge branch 'master' of https://github.com/groovehunter/workflow
Merge branch 'master' of https://github.com/groovehunter/workflow

Conflicts:
	workflow.make