Merge pull request #8 from cloudoer/master

login and register
fix conflict
conflict solve
Merge remote-tracking branch 'upstream/master'
my info
ui adjust
Merge remote-tracking branch 'upstream/master'