FIX GOOGLE MAP AND GOOGLE STREET VIEW
Merge origin/master