Issue 15

Merge with master ehcache + second level hibernate