Added resolution_ref entity recognition
Merge branch 'resolution_ref' into develop