Map User location and App Icon
Merge remote-tracking branch 'origin/master'