orxonox/branches/heightMap: merged trunk back to the heightMap branche merged with command: svn merge trunk/ branches/heightMap/ -r 4122:HEAD