Refactored restaurant activity + test Gmap
Merge with Thomas + fixed Gmap problems