Merge branch 'multiple-pages' into devel

+ multiple image pages shown when there are too many images to display