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

Conflicts:
	Database/functions/convert_lmn_routes
	Database/functions/pt_room_code