Merge pull request #21 from xiatao123/master

ui update and favorite
Merge remote-tracking branch 'upstream/master'