kkkkkk
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/cdecor/views/site/_gallery.php
lllll