add node, network_node and entity_type

also make some changes in attribute and branch classes
Merge branch 'master' into cruz
Merge branch 'cruz'