Merge branches 'master' and 'ruansiyuan' of http://begitlab.chubanyun.me/rays/pcloud-book into ruansiyuan
