Fix Google Map (change javascript src link, no API key etc)
Merge remote-tracking branch 'origin/master'