lots of refactorings, lists working in meetings and teams
Merge remote-tracking branch 'origin/master'