11
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	config/indicator.xml