Yssaril:
	- remove the addonspecific UpdateMerchant from the filters and replace it with FilterUpdate which the addon core must handle
	- fixed a small bug that should never occure in the EquipLocFilter
