Adapt the scaffolding and the extended field to branch management

rebase master, adjust
there may be some problems with resource management (anahide said she added a way to update a resource, we must adapt it)