Merge pull request #96 from jun-lu/master

get update
some edit
edit room
Merge pull request #97 from jun-lu/master

获取跟新
Merge pull request #112 from CKHuang/master

room edit