worked on dashboard page
Merge branch 'master' of https://github.com/parambsingh/nadpe

Conflicts:
	_core/modules/tradepart/templates/admin/admin_accept_trade.tpl.html
	_core/modules/tradepart/templates/admin/admin_verifyinventory.tpl.html
	graphics/admin/Thumbs.db