misc
misc
Stephen Lyons: compiler warning reduction patch
Merge branch 'fixHeiko'

Conflicts:
	src/T2DMap.cpp
Stephen Lyons: warning reduction patch 2
Merge branch 'master' of git://git.code.sf.net/p/mudlet/code
Merge branch 'master' into mudletDev