chenge socket host
modified object property
Merge branch 'frontend'