Fixed the datanucleus problem and updated to App Engine SDK 1.9.5
Merge branch 'dev' into webclient