adding map & partner lookout, updated string.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	QPoolTaxi/res/values/strings.xml