First commit
Completed aspects of thread control
Merging master into thread-control
Tracing an object id bug
Maps are now scrolling and following the focussed player
Merge branch 'thread-control'

Conflicts:
	src/main.cpp