Added subscription type and editor id to the notification entity
Merge remote-tracking branch 'origin/jpa' into jpa