updated again at the same place after reverted and created a branch out of the reverted and merged that into master. wow.
Merge branch 'wsp'

* wsp:
  updated again at the same place after reverted and created a branch out of the reverted and merged that into master. wow.

Conflicts:
	ComponentBuilder.java