vidyasagar - resolved conflicts
Merge branch 'master' of github.com:amzurtechnologies/ITKnowledgeTransfer