chnages to edit
Merge branch 'mainank'

Conflicts:
	app/views/admin/shared/_edit.html.erb