fix
Merge branch 'develop' into feature/shape_refactor

Conflicts:
	test/testhelper.js
fix textshape
Merge branch 'develop' into feature/shape_refactor
fix test
fix test
fix test
fix shape
fix test
fix search
rename
fix filter
bugfix
Merge branch 'feature/shape_refactor' into develop
build
fix shape test
fix contains method in Rect
fix result scene
fix result
fix title and test