ad changes - include is broken!
Merge remote-tracking branch 'origin/ldap_changes'

Conflicts:
	lib/base/data_types.js
	lib/stores/ldap/exec.js