Merge branch 'master' into calendar_export

apps/calendar/lib/calendar.php

apps/calendar/lib/object.php

apps/files_external/lib/config.php

apps/files_external/lib/dropbox.php

apps/files_external/lib/google.php

apps/files_sharing/sharedstorage.php

apps/files_versions/ajax/getVersions.php

apps/files_versions/history.php

apps/files_versions/js/versions.js

apps/files_versions/templates/history.php

lib/app.php