P2P and Google views
Merge branch 'master' of https://github.com/HyperrealTech/thorn-deterrence-backend