fixed bug in entity occurence resource, ignoring foreing key fields
fixed bug when editing entity at the very end of the sentence
Merge branch 'bug-entity-edition' into develop