fix for TOOLS-2575
fix for TOOLS-2565
Merge pull request #22 from wso2-dev/developer-studio-3.7.0

sucessfully commited the changes
Timestamp : Wed Jul 09 19:34:41 IST 2014
https://wso2.org/jenkins-pr-builder/job/developer-studio/29/