fix docblock
fix dragging on mobile devices
Merge branch 'master' into develop