renamed files
got changed in master - removed some code
more changes to mess
Merge branch 'wsp' into master

Conflicts:
	ComponentBuilder.java - resolved conflict.
more master changes
updated after reverted a message.
Merge branch 'wsp-999-after-revert'

* wsp-999-after-revert:
  updated after reverted a message.
  Revert "more asp changes"
  more asp changes

Conflicts:
	ComponentBuilder.java
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