Rest development: add/delete/get resources and add/delete/get nodes
commit before merge
merged conflict