orxonox/trunk: merged the christmas branche to the trunk merged with command: svn merge -r6165:HEAD christmas_branche/ ../trunk/ no conflicts