start to implement draggable and droppable
Merge branch 'master' of https://github.com/Group6-Lab4/FinalProject

Conflicts:
	js/controller/editViewController.js