[FIX] some rewriting
Merge branch 'versioning' of https://github.com/otrack/Leads-infinispan into versioning