added some comments
Merge branch 'wsp' into master

Conflicts:
	ComponentBuilder.java - resolved conflict.