修改部分
Merge branch 'develop' of https://github.com/WangTe/huazhixun into develop

Conflicts:
	application/views/teacher_info.php