Merge branch 'master' into multi_app_dir

apps/calendar/templates/settings.php

apps/contacts/css/contacts.css

apps/contacts/js/contacts.js

apps/contacts/js/jquery.combobox.js

apps/contacts/templates/part.edit_address_dialog.php

apps/contacts/templates/part.importaddressbook.php

apps/gallery/ajax/thumbnail.php

apps/gallery/appinfo/database.xml

apps/gallery/appinfo/update.php

apps/gallery/appinfo/version

apps/gallery/index.php

apps/gallery/lib/managers.php

apps/gallery/lib/tiles.php

apps/gallery/lib/tiles_test.php

apps/gallery/templates/index.php

apps/user_ldap/group_ldap.php

apps/user_ldap/lib_ldap.php

apps/user_ldap/user_ldap.php

apps/user_migrate/js/export.js

core/lostpassword/index.php