confusion

just backup
Merge branch 'jingjing_dev' of https://github.com/zzswang/Event into jingjing_dev