Merge branch 'master' into contactsmanager-register

Conflicts:
	lib/private/contactsmanager.php

diff --cc lib/private/contactsmanager.php
index 8cfbb3da9f646afcce2ff5aee1724d73ecaaa170,26264d4e988ea7edb90d2fcff27fa6325eb807a0..338cc04865158fde990b7bb70e07cb6cf0183c51
--- 1/lib/private/contactsmanager.php
--- 2/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@@ -31,16 -31,15 +31,16 @@@ namespace OC 
                 * @param string $pattern which should match within the $searchProperties
                 * @param array $searchProperties defines the properties within the query pattern should match
                 * @param array $options - for future use. One should always have options!
-                * @return array of contacts which are arrays of key-value-pairs
+                * @return array an array of contacts which are arrays of key-value-pairs
                 */
                public function search($pattern, $searchProperties = array(), $options = array()) {
 +                      $this->loadAddressBooks();
                        $result = array();
 -                      foreach($this->address_books as $address_book) {
 -                              $r = $address_book->search($pattern, $searchProperties, $options);
 +                      foreach($this->addressBooks as $addressBook) {
 +                              $r = $addressBook->search($pattern, $searchProperties, $options);
                                $contacts = array();
                                foreach($r as $c){
 -                                      $c['addressbook-key'] = $address_book->getKey();
 +                                      $c['addressbook-key'] = $addressBook->getKey();
                                        $contacts[] = $c;
                                }
                                $result = array_merge($result, $contacts);

diff --cc lib/public/contacts/imanager.php
Simple merge