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

Conflicts:
	temp/Temp

Signed-off-by: xianlin <idmsx@Dell-960.stf.nus.edu.sg>