merge master into filesystem

3rdparty/when/When.php

apps/admin_dependencies_chk/settings.php

apps/calendar/l10n/xgettextfiles

apps/calendar/templates/calendar.php

apps/calendar/templates/lAfix.php

apps/gallery/ajax/cover.php

apps/gallery/ajax/createAlbum.php

apps/gallery/ajax/galleryOp.php

apps/gallery/ajax/getAlbums.php

apps/gallery/ajax/getCovers.php

apps/gallery/ajax/scanForAlbums.php

apps/gallery/ajax/thumbnail.php

apps/gallery/appinfo/app.php

apps/gallery/appinfo/info.xml

apps/gallery/index.php

apps/gallery/lib/album.php

apps/gallery/lib/hooks_handlers.php

apps/gallery/lib/images_utils.php

apps/gallery/lib/photo.php

apps/gallery/lib/scanner.php