added google maps to manifest file
Merge branch 'master' of https://github.com/schreon/matchmaking