orxonox/trunk: merged the NewModel branche back to the trunk. merged with command svn merge branches/newModel/ trunk/ -r 6016:HEAD no conflicts