Revert "merge"
Revert "merge"

This reverts commit 311a2a8e91578511595d76cc97b16a4ae502c633.

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