Merge branch 'master' into oc_error

apps/calendar/lib/object.php

apps/contacts/ajax/contacts.php

apps/contacts/ajax/loadcard.php

apps/contacts/appinfo/app.php

apps/contacts/index.php

apps/contacts/js/contacts.js

apps/contacts/lib/addressbook.php

apps/contacts/lib/app.php

apps/contacts/lib/hooks.php

apps/contacts/lib/vcard.php

apps/files_external/lib/dropbox.php

apps/files_texteditor/js/editor.js

apps/media/lib_scanner.php

lib/app.php

lib/base.php

lib/connector/sabre/directory.php

lib/helper.php

lib/vcategories.php

public.php

remote.php