修改
Merge branch 'master' of https://github.com/Foboy/GoGoTown

Conflicts:
	trunk/crm/admin/partials/merchantinfo.html
	trunk/crm/admin/scripts/rest-urls.js
	trunk/crm/admin/scripts/user/merchant-ctrl.js