fix #213, android: marker problem
android: green line
minor fix: use localhost host
ui: geocoding
Merge remote-tracking branch 'upstream/master'