auto generated change by IDE
Merge branch 'master' of https://github.com/pan-long/Android3DVisualisationTool
Merge branch 'master' of https://github.com/pan-long/Android3DVisualisationTool
fix the conflict between drag and scale