Add support for component
Merge remote-tracking branch 'origin/add/component-support' into add/component-support

Conflicts:
	component.json