fix
fixed conflict
fixed unpersisted rels and invalid date persistence
Merge pull request #29 from kmussel/master

fixed unpersisted rels and invalid date persistence