orxonox/data/trunk: merged the data from mountain-lake back here merged with command: svn merge -r625:HEAD https://svn.orxonox.net/data/branches/mountain_lake