actualizando
Merge branch 'cruz'
Merge branch 'master' into uchija

Conflicts:
	lib/compose_entity.rb
JSON
delete entity basic,compose
Merge branch 'uchija'
clean code
Merge branch 'uchija'
add node, network_node and entity_type

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