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
修改
修改
修改
修改
修改
change js
jieming change
I change register
change register.phtml
change reigister.js bug
增加了注册功能
Merge branch 'master' of github.com:englisheducation/englisheducation
Merge branch 'jianzhiyao'