more asp changes
Revert "more asp changes"

This reverts commit 104acc284d034a1117872867def3dc571efabc82.
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