update team info
Merge branch 'gh-pages' into 2013-december