Refactored code due to introduction of toStringBuilder() and hashCodeBuilder() APIs.
Merge branch 'master' of https://github.com/axlm/Entity