Merge branch 'master' of https://github.com/waterdrw/coms-customer

Conflicts:
	www/member/js/login.js
	www/setting/js/setting.js
ddd