Merge origin/master

Conflicts:
	src/KryuuJSObjectShare/Controller/ObjectController.php
	view/kryuu-js-object-share/object/js.phtml