Merge branch 'master' into multi_app_dir

apps/calendar/lib/search.php

apps/contacts/js/contacts.js

apps/contacts/lib/search.php

apps/contacts/templates/index.php

apps/contacts/templates/part.contacts.php

apps/files_encryption/tests/proxy.php

apps/files_sharing/sharedstorage.php

apps/files_versions/versions.php

apps/tasks/css/style.css

apps/tasks/js/tasks.js

apps/tasks/templates/tasks.php

lib/filestorage/common.php

lib/filestorage/local.php

lib/filesystemview.php