orxonox/proxy: merged the proxy.old back again, and it seems to work.
Merged with command svn merge -r9247:HEAD https://svn.orxonox.net/orxonox/branches/proxy.old .
no conflicts