update ui merchant
Merge branch 'master' of https://github.com/boojjee/thailandmall

Conflicts:
	gocart/themes/buyer-backend/views/header.php
	gocart/themes/merchant-backend/views/dashboard.php