Added dragging test
Merge branch 'dev-gradle' into drag-task-test
Merge branch 'dev-gradle' into activity_timestamp