Added possibility to add and remove categories and entities.
Added hash and equals to Entity