Merge pull request #20 from stoewer/master

Solved several small issues with JPA

LGTM
Model: more scalaesque factory methods

In order to interact better with the json combinator lib
the factory functions now take Option and Seq instead of null
and util.Set.

Test adjusted.