conflict solve
Merge remote-tracking branch 'upstream/master'
ui adjust
Merge remote-tracking branch 'upstream/master'
register update
register update
register update
register update
Merge pull request #9 from cloudoer/master

register update