Merge pull request #505 from stianst/master

Added hybrid model provider with jpa stores
Removed removeAllData from model