Text in rectangles, ellipsis if needed
Merge remote-tracking branch 'origin/master'

Conflicts:
	dnd.js