15:09
Merge branch 'master' of github.com:sunweilun/robocup-2013

Conflicts:
	ImageProcessor.cpp
	ImageProcessor.h
	WorldMap.cpp
	WorldMap.h
	defs.h