https://trello.com/c/hASbc0Rs/10--
https://trello.com/c/pqphNI45/9--
Merge branches 'master' and 'omelchenko' of https://github.com/samsonos/cms_app_gallery into omelchenko

Conflicts:
	src/App.php
	www/tumbs/item.vphp

messdetector errors corrected
mess detector errors corrected