Merge branch 'beta'

This commit is contained in:
Max Lv
2017-02-13 09:21:18 +08:00