cleaned up colorConverter, renamed to TeamConverter
Merge branch 'master' of https://github.com/statlas-developers/webserver