Fixed dependency problem with datanucleus-core
Merge branch 'dev' into webclient