My personal tweaks to Gallery...
Merge branch 'mblythe_edits' into 3.0.x

Conflicts:
	themes/wind/views/page.html.php