persistence.xml changes
tracking
gitigore can be replaced
Merge branch 'master' into persistence-off-master
now