[AW] {refactoring} Simplified navigation drawer and map view.
[RL] {other} conflicts resolved

Conflicts:
	projects/TrackMe/res/values/strings.xml