Merge branch 'master' into migration

README

apps/contacts/ajax/addcontact.php

apps/contacts/ajax/saveproperty.php

apps/contacts/css/contacts.css

apps/contacts/img/person_large.png

apps/contacts/index.php

apps/contacts/js/contacts.js

apps/contacts/js/jquery.combobox.js

apps/contacts/js/jquery.multi-autocomplete.js

apps/contacts/templates/index.php

apps/contacts/templates/part.contact.php

apps/contacts/templates/part.edit_address_dialog.php

apps/contacts/templates/settings.php

apps/files_texteditor/js/editor.js

apps/remoteStorage/appinfo/info.xml

apps/remoteStorage/appinfo/webfinger.php

apps/user_ldap/appinfo/info.xml

apps/user_openid/appinfo/info.xml

apps/user_webfinger/.htaccess

apps/user_webfinger/appinfo/info.xml