sekhar- conflicts resloved
Merge branch 'master' of https://github.com/amzurtechnologies/ITKnowledgeTransfer