GA
working version
fixing conflicts and merging with master
Merge branch 'master' into meetings