VP-147
VP-147
Merge remote-tracking branch 'upstream/develop' into feature/vp-83-custom-error-pages
Custom chybové stránky 403,404, ...
Merge pull request #115 from miroslavhajek/gallery

Gallery
Merge remote-tracking branch 'upstream/develop' into feature/vp-83-custom-error-pages
local commit
oprava dle pripominek na githubu, predelani definice ikon mimetypu z metadat do configu
fixed bugs mentioned in comments on github, definition of mimetypes icons moved from metadata to config
fixed multilevel array merge
Merge pull request #116 from pavel-mozis-lundegaard/feature/VP-147-backend-icons

Feature/vp 147 backend icons
Merge pull request #119 from miroslavhajek/feature/vp-83-custom-error-pages

Feature/vp 83 custom error pages
Instance of fix
Merge pull request #120 from miroslavhajek/feature/vp-83-custom-error-pages

Instance of fix
Fix limit (max = 9999)