Retina favicon
Retina map marker
minor css
favicon update
Merge remote-tracking branch 'upstream/master'