Redhen update.
Revert "Redhen update."

This reverts commit 68a839c7e4490da474004e69a063445d4c7ccbcd.
Updating entity api.
Updating redhen.
Merge branch 'develop'