orxonox/trunk: merged branches/parenting back to the. merged with command: svn merge branches/parenting trunk -r 3247:HEAD resolved all conflicts in favor of parenting.