merge filesystem into gallery
merge filesystem into gallery

alberanid/bookmarks,shtrom/bookmarks,owncloud/bookmarks,shtrom/bookmarks,tflidd/bookmarks,behrisch/bookmarks,behrisch/bookmarks,owncloud/bookmarks,alberanid/bookmarks,tflidd/bookmarks