Progress on work for drag and drop
Merge commit '8bb77980d27e4b7ca73cc2931a1ae7be8e379a7d' into develop

Conflicts:
	dist/bundle.js
	scripts/grid.js