removed last traces of iResidues field
fixed edit hint
Merge remote-tracking branch 'origin/refactor' into refactor