0401修正　バグFix
Merge branch 'release/1.0'
Merge branch 'release/1.0' into develop

Conflicts:
	pugera.txt