commit before merge
Merge branch 'master' of https://github.com/shunishya/FindingFriendsServer
testing code
sync according to device id is implemented.