history修整.
Merge branch 'beta'