Fix friends list
Update styles
Resolve merge conflicts
Add team styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	tabootrees/main.pyc
Update gitignore