sync
Merge remote-tracking branch 'origin/tal' into wes
sync
Merge remote-tracking branch 'origin/tal' into wes
restructured the naming of the members so it's easier for adding/removing members from teams, also removed betty+henny
re-ordered teams in alphabetical order
minor bug-fix
Merge remote-tracking branch 'origin/wes' into tal