Test set - edit option
Merge branch 'master' of https://github.com/AutomationSolutionz/Framework_0.1

Conflicts:
	Automationz/Framework_0.1/DjangoFramework/MySite/views.py
	Automationz/Framework_0.1/DjangoFramework/site_media/Jquery/Local/testset_tag.js
edit option