Fix team stuff
Merge branch 'master' of github.com:drugis/drugis.org