new location based messaging
Merge branch 'master' of https://github.com/charmjunewonder/BVW-Round-2
new changes