Adding more component information
Merge remote-tracking branch 'github/v1.0.0' into v1.0.0

Conflicts:
	matterframework/src/main/webapp/components/persistence/index.jsp