forteen
sixteen
Merge branch 'master' of https://github.com/kaiyuan111/study_platform

Conflicts:
	code/protected/controllers/TeacherController.php
	code/protected/models/StudyDiscuss.php
	code/protected/views/teacher/message_list.php