xx
xx
xx
Merge remote-tracking branch 'origin/master'

Conflicts:
	ajax.php
	assets/templates/general/header.html
	core/cache/resource/web/resources/1.cache.php
	core/nicekadr/elements/snippets/snippet.gallery.php