Merge pull request #24 from Jammooka/master

Renamed menu for consistency, added google maps fixes