added markers, icons, click listener
Merge remote-tracking branch 'origin/master'