orxonox/trunk: merged the proxy back
merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .
no conflicts