Added Gallery Inventory

Added basic gallery inventory
Merge remote-tracking branch 'origin/master'

Conflicts:
	gallerydb.php