CHANGE: Reduced the time that it takes to unload a map
CHANGE: Modify simuconf.tab settings for better network performance
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new

Conflicts:
	simhalt.cc