Updated Edit View
Edit Template Update
Merge branch 'master' of https://github.com/Molitov/collab-edit

Conflicts:
	static/css/edit.css
	static/js/edit.js
	views/edit-template.html