Revert "merge"

Conflicts:
	www/member/js/login.js