Update. Merging with master
Import Orga. wow nice commit
commit before merging with event
Merged with event
Merging/Reworking/refactoring done. Notification is now abstract