Merge pull request #82 from Chrisazy/master

Some fixes for minion spawn times and not generating gold until then
Added collision (untested)

Added some small functionality and the collisionmanager
Merge branch 'master' of https://github.com/Querijn/IntWars

Conflicts:
	gamed/include/Map.h