add text type and numeric type
add branch, unify class entity

combine compose_entity and basic_entity
Merge branch 'cruz'
Merge branch 'master' into uchija

Conflicts:
	lib/compose_entity.rb