.
Merge branch 'master' of https://github.com/xianlin/map_indoor/

Conflicts:
	temp/Temp