Merge pull request #164 from coen-d/develop

Bypassing tests coen
F2 now also works to edit items in a cluster that have not been moved yet.