Filtering in inventory

got filter in inventory to work, except filter by artist, the sql query
is incorrect somehow.
Merge remote-tracking branch 'origin/master'

Conflicts:
	gallerydb.php