fix part of bug that Doris found
Merge branch 'master' of github.com:takashi-osako/sunny_tales

Conflicts:
	sunny_tales/resources/elements.json
	sunny_tales/static/js/models/report_component.js
	sunny_tales/static/js/views/canvas.js