Merge branch 'dev-1.10' into Feature-CustomShapes
resolves #572: edit name and batch add to slide done.
Merge branch 'Feature-CustomShapes' into dev-1.10