commiting
modified few layouts
removed conflicts
priyanka-homeindex,user index layout
priyanka-conflicts resolved
priyanka-home_template layout fixed
priyanka-home_template layout fixed
Merge branch 'master' of github.com:amzurtechnologies/ITKnowledgeTransfer