fixing element interactions on drag
Fixed conflicts

Conflicts:
	templates/index.html