orxonox/data/trunk: merged the mountain-lake back here, merged with command: svn merge -r566:HEAD https://svn.orxonox.net/data/branches/mountain_lake .
no conflicts