Merge pull request #10 from wagnert/master

Move annotations from persistence container package to this package