merchant flag and priority merchants

Changes include new inventory with cushion, new yaml file, changes to
inventory model, local merchant flag and higher priority to local
merchants
binary files
Merge remote-tracking branch 'origin/master'

Conflicts:
	main1.pyc
Merge branch 'master' of https://github.com/arvindvg/slavgsparklie