Test Amember
Test Amember
修改过后的sql
我修复后的sql
修改sql
出现版本冲突
Merge branch 'master' of github.com:englisheducation/englisheducation
删除localhost.sql.bak
revise the structure of database
Merge branch 'master' of github.com:englisheducation/englisheducation
change primary=type_id
we need to change register.phtml
add BBS
aaa
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