Merge branch 'master' into calendar

apps/admin_export/appinfo/info.xml

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/database.xml

apps/gallery/appinfo/info.xml

apps/gallery/css/styles.css

apps/gallery/index.php

apps/gallery/js/album_cover.js

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

apps/gallery/templates/index.php