preparation for merge
Merge branch 'master' of github.com:rickbatka/co-op-engine
Server is proto ready