SAM #82 - Notification- System
Merge pull request #85 from JanHorak/SAM_82

SAM #82 - Notification- System