merge master into encryption

3rdparty/MDB2/Driver/mysql.php

3rdparty/phpass/PasswordHash.php

3rdparty/phpass/c/Makefile

3rdparty/phpass/c/crypt_private.c

3rdparty/phpass/test.php

apps/calendar/ajax/settings/guesstimezone.php

apps/calendar/js/geo.js

apps/files_encryption/lib/proxy.php

apps/files_sharing/sharedstorage.php

apps/gallery/ajax/galleryOp.php

apps/gallery/ajax/getAlbums.php

apps/gallery/js/albums.js

apps/media/ajax/api.php

apps/media/lib_scanner.php

apps/remoteStorage/BearerAuth.php

apps/remoteStorage/WebDAV.php

apps/remoteStorage/appinfo/info.xml

apps/remoteStorage/auth.php

apps/remoteStorage/lib_remoteStorage.php

apps/remoteStorage/oauth_ro_auth.php