db stuff
Merge pull request #15 from wawiwa/develop

db stuff
local db
Merge remote-tracking branch 'base/master' into develop
Merge pull request #18 from wawiwa/develop

Develop
mod persistence.xml
updated user
Merge pull request #19 from wawiwa/develop

domain classes updated
thierry's stuff
Merge pull request #20 from wawiwa/develop

thierry's stuff