almost finish change of pending table
t
Merge branch 'fea-add-account-register' of https://github.com/shengyongjiang/sinoramamembership into fea-add-account-register

Conflicts:
	shared/models/membershipmodel.php