Merge branch 'develop'
refactoring server side
use websocket and refactoring server side
resolve conflict
add .idea to .gitignore
Merge branch 'develop'
Merge branch 'develop'
add gallery(test page)
improved setting title