[ADD] Render markers and top bar in map
Merge remote-tracking branch 'origin/android_2_client_development' into android_2_client_development