コメント修正&順序修正
Merge pull request #42 from nikezono/document/p1/jpcomment

コメント修正&順序修正
Merge branch 'master' of https://github.com/nikezono/Addict-Client into develop/p1/setImeConfig

Conflicts:
	Addict/src/main/java/net/jp/addict/keyboard/SoftKeyboard.java