socket service
routing
dummy UI
Merge branch 'origin/master'
Merge branch 'origin/master'
changing map pictures