actualizando
Merge branch 'master' into uchija

Conflicts:
	lib/compose_entity.rb
JSON
delete entity basic,compose
Merge branch 'uchija'