register new
Merge branch 'jieming' of github.com:englisheducation/englisheducation into jieming

Conflicts:
	application/views/scripts/member/regisiterService.php
	application/views/scripts/member/register.phtml
	public/js/regisiter.js