commit

微调
Merge branch 'cj1_15-12-13Branch'