Merge pull request #99 from kaviththiranga/developer-studio-3.7.0

Fixing Tools - 2537 & CApp undeployment issue.