Add drawshape , shapesize and  drop image function
Merge branch 'develop'