fix
Merge branch 'master' of https://github.com/yuhang2/quku

Conflicts:
	quku/application/controllers/cron.php
	quku/application/models/qq_model.php