Cd and Controller updated
Merge branch 'master' of https://github.com/navinpai/OSMT2013.git