Modified the persistence.xml, added test-persistence.xml and arquillian.xml. I have no clue if i did it right though...
Merge branch 'master' into tjosan