Merge branch 'master' of http://github.com/lancelotnull/lightning
userCenter credit bug write
Merge branch 'master' of https://github.com/tianling/lightning
merge luo