Some naming changes
Added notifications for user connections
Stuff from work