gallery.php
Merge remote-tracking branch 'origin/tttt' into tttt

Conflicts:
	gallery.php