added geolocation
fixed img
?
Merge remote-tracking branch 'james/master'