finish DnD
1
Merge commit 'bbcbdd606cca67c84a286eb963fed1bc53a58ce5'

Conflicts:
	ViewController/public_html/WEB-INF/temp/adf/styles/cache/divas-desktop-jroxwk--d-webkit-d-d-ltr-d--s-n-u.css