orxonox/trunk: merged the single_player_map branche back merged with command: svn merge -r8896:HEAD https://svn.orxonox.net/orxonox/branches/single_player_map . no conflicts