Fixed test config now
Fixed a bug in persistence.xml for testing.
Merge branch 'work' into facelets