Merge branch '1.5-Nodes' into 1.5

Refactor Nodes plugin: moving logic to model.
Closes #321