small changes
merge
fixed the regression problem with sameHeight directive in wrong element
ldap spec changes
merge