Fixing badge on entity cell
Correct detection of selected entity
Merge pull request #8 from limejelly/master

Badge & selection