merge lunixbochs/uberserver & springrts repo

sorry that i commited under your name :-/

feel free to revert stuff, but this step was really neded to get everything into one repo again.

springrts repo and your repo had diverged...