解决冲突
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform.git

Conflicts:
	protected/runtime/application.log
修改了任务系统
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform.git

Conflicts:
	client/cocos2d.js
	protected/runtime/application.log