Correct entity namespace.
Merge branch 'develop' into apiscaffold