Added defined functions in the hpp to the cpp
On time
Merge ssh.icp.uni-stuttgart.de:/home/zeman/repos/edward

Conflicts:
	simlogic/Map.cpp
	simlogic/Position.hpp
	simlogic/Spy.hpp
Push from work on Map an World
Init
Init
Curent semi working copy
Merged
Working state, this is the new master