更新modules，添加cross-validation
Merge branch 'master' of https://github.com/daiqing2009/CLS_chatlog

Conflicts:
	controllers/default.py
	models/db.py
	modules/classify.py
清晰指向categories的外键