basic function done.
resolved conflict
Merge branch 'master' of github.com:afc163/ued.alipay.com