Merge branch 'master' of https://github.com/imsmms/Location-Based-Chat-Mobile