inii1:
未テスト
Merge branch 'master' of github.com:syakesaba/c-icap-java

Conflicts:
	.gitignore