orxonox/data/trunk: merged the terrain branche back. conflicts reverted. merged with svn merge -r455:HEAD https://svn.orxonox.net/data/branches/terrain .