Fixing obvious bug

There is a PSR-0 issue in the Entity core class and a useless return in Intivation entity class.

Hope this helps :beer: