Repaired
Pippi Langstrumpf
Merge branch 'development'
ldap changes