don't know
Merge branch 'master' of http://github.com/tjproject/TiCheck_Server

Conflicts:
	protected/runtime/application.log