model and new meeting activity modified
Merge branch 'master' into slave