orxonox/trunk: merged the guiMerge-branche back into the trunk merged with command: svn merge -r 4043:HEAD guiMerge/ ../trunk/ no conflicts, only updates and moves