CompositeComponent
Merge remote-tracking branch 'origin/master'

Conflicts:
	App.web/src/main/webapp/src/component/recursoComponent.js