Tick for 1.2.3.1: Added /trade search & fixed /trade cancel not showing when /trade was executed. /trade list still needs fix.
(forgot refs the first time)
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	Shop/Shop.cs