Added javadoc
Merge branch 'dragon-drop-fixes-tomerge' into dragon-drop-fixes