dirty design stuff for gwen to fix
Merge branch 'master' of https://github.com/StarTrack/server