changes in templates
edit in topic page
Merge branch 'topic' of https://github.com/priyanjasingh/webportal into priyanjasingh-topic

Conflicts:
	templates/contributor_topic.html
Merge branch 'priyanjasingh-topic'