Fixed stage dragging to work properly
Fixing Javadoc
Merge branch 'dev-gradle' into fix-stage-drag
fix cancel bug
Merge branch 'dev-gradle' into activity-ui-tweaks