d
fixed appsocket client
Merge branch 'master' into gps