LDAP integrated with our database now for performance reasons
Merge branch 'development' of https://github.com/broql/zap into development