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

Conflicts:
	code/protected/config/table.sql