Commented out ehcache from persistence.xml. Issue#495
Merge branch 'trunk' of github.com:impetus-opensource/Kundera into trunk
Reverted back ehcache change. Issue #495