continued a bit ...
Merge branch 'master' of https://github.com/icpcpp/edward

Conflicts:
	simlogic/Map.hpp
	simlogic/World.cpp
	simlogic/World.hpp

removed all compiling errors, and reduced warnings to 10!