orxonox/trunk: merged branches/updater back into the trunk merged with command: svn merge branches/updater trunk -r 3241:HEAD resolved conflicts in debug.h in favor of the trunk.