cys
Merge branch 'master' of https://github.com/billycat/CheckSolution4IndoorMap

Conflicts:
	CheckSolution4IndoorMap/config/rules.mdb