quantity update tooltip
fixed merge issuesMerge branch 'master' of https://github.com/parambsingh/nadpe

Conflicts:
	_core/modules/tradepart/templates/admin/admin_tradelist.tpl.html
	_core/modules/tradepart/templates/admin/tradepartlistadmin.tpl - Copy.html
deleted junk files