CW-193 - xap widget never ends
Merge pull request #25 from CloudifySource/CW-193

CW-193 - xap widget never ends