Merge branch 'master' into routing

apps/user_ldap/appinfo/app.php

apps/user_ldap/group_ldap.php

apps/user_ldap/lib/access.php

apps/user_ldap/lib/connection.php

apps/user_ldap/tests/group_ldap.php

apps/user_ldap/user_ldap.php

apps/user_openid/appinfo/app.php

lib/base.php

lib/group.php

lib/group/backend.php

lib/group/interface.php

lib/helper.php

lib/ocs.php

lib/public/groupinterface.php

lib/public/userinterface.php

lib/public/util.php

lib/user.php

lib/user/backend.php

lib/user/interface.php