Revert "Revert "fix bugs""
Revert "Revert "fix bugs""

This reverts commit 7b5c1e743b827fc705d7d6cbbaa5340d2faee0cf.

szxw/galaxy,leoYY/galaxy,sdgdsffdsfff/galaxy,taotaowill/galaxy,WangCrystal/galaxy,szxw/galaxy,ontologyzsy/galaxy,linyvxiang/galaxy,bluebore/galaxy,fxsjy/galaxy,baidu/galaxy,WangCrystal/galaxy,May2016/galaxy,bluebore/galaxy,szxw/galaxy,Kai-Zhang/galaxy,linyvxiang/galaxy,leoYY/galaxy,baidu/galaxy,linyvxiang/galaxy,fxsjy/galaxy,szxw/galaxy,baidu/galaxy,ontologyzsy/galaxy,bluebore/galaxy,szxw/galaxy,bluebore/galaxy,bluebore/galaxy,imotai/galaxy,fxsjy/galaxy,fxsjy/galaxy,linyvxiang/galaxy,ontologyzsy/galaxy,fxsjy/galaxy,imotai/galaxy,ontologyzsy/galaxy,sdgdsffdsfff/galaxy,leoYY/galaxy,taotaowill/galaxy,WangCrystal/galaxy,taotaowill/galaxy,sdgdsffdsfff/galaxy,imotai/galaxy,fxsjy/galaxy,imotai/galaxy,Kai-Zhang/galaxy,May2016/galaxy,May2016/galaxy,leoYY/galaxy,fxsjy/galaxy,linyvxiang/galaxy,ontologyzsy/galaxy,linyvxiang/galaxy,sdgdsffdsfff/galaxy,Kai-Zhang/galaxy,leoYY/galaxy,imotai/galaxy,sdgdsffdsfff/galaxy,leoYY/galaxy