Priti/Sailee/Aasawaree: Made changes in Rakefile and SampleRakeFile
conflicts removed
Merge branch 'master' of github.com:anandbagmar/tta