Bring back annotations
Add Child and Parent annotations
Add Key generation for Long id type
quite few changes for object mapping
Test updates
Merge remote-tracking branch 'origin/master'