Fixed the rotate and drag-move
Merge remote-tracking branch 'origin/master'