changes for map and device token

changes for map and device token
Merge branch 'master' of https://github.com/rajivbajaj/likeme