fix
Merge branch 'develop' into feature/shape_refactor

Conflicts:
	test/testhelper.js
fix textshape
Merge branch 'develop' into feature/shape_refactor
fix shape
Merge branch 'feature/shape_refactor' into develop