fixed javadoc
Notification parent oneToOne
Merge remote-tracking branch 'origin/master'