Add Google maps to homepage
Fix merge errors