Merge branch 'master' into dev
pulled master into dev.

added cursor for dragged divs.
Merge branch 'dev'