Merge pull request #2 from DavidWinterbach/master

Update and code
Gmaps + user position
Merge pull request #1 from Jason-F/master

merging