HOTFIX: hide > 4 flavors on team page, show via button
HOTFIX: add plan-type illustrations
HOTFIX: don't show team welcome message on user profile
HOTFIX: update setup and payment texts
HOTFIX: Always show scrollbars to not toggle page width on panel hover
HOTFIX: nix bold/italic on FREE in setup text
Merge branch 'staging' of github.com:openplans/planbox into change-submission-visibility

Conflicts:
	src/planbox_ui/static/styles/main.css