Refactoring method Notification#notify
Fix self-xss issue in contact-group-rename
Fix another self-xss issue
Fix broken aspect-edit sidebar update
update changelog [ci skip]
Merge pull request #4945 from hpetru/notifications

Refactoring Notification#notify
Merge pull request #5048 from kpcyrd/fix-5031

Fix self-xss issue in contact-group-rename
Merge pull request #5049 from kpcyrd/aspect-edit-fix

Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js