Updated entities file
Merge branch 'orodrigu'

Conflicts:
	schemas/entities.rng
Updated entities file