緊急修正
Merge branch 'develop'

Conflicts:
	test.php
Merge branch 'develop'