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