done drag&drop statements
Merge branch 'master' of github.com:suhan1021/3213Team12

Conflicts:
	coincide/coincide/static/scripts/app/main.js
	coincide/coincide/static/scripts/app/templates/applicationTemplate.html