try to fix confict
Merge branch 'master' of http://github.com/jian-cui/web_track

Conflicts:
	tracknearest_surface.py