changed some notification and teams stuff
no changes
fixed conflict
minor changes
Removed groups, replaced notifications with bulletins
Merge pull request #31 from capms/curley

Curley