adjustment.
Merge remote-tracking branch 'beauty/master'
fail to upload userimage.
add alipay.
fix conflict.
Merge pull request #62 from zhou5211/master

add alipay.