Prepared Drag and Drop
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	app.js
	index.html