make more generic so it now works with normal hibernate entities as well as JPABase
Merge branch 'entities' into latest
fix for websocket
Merge branch 'websocket' into latest