Merge branch 'master' of https://github.com/orchely/ckw-mod

Conflicts:
	ime_wrap.cpp
Merge branch 'master' of https://github.com/orchely/ckw-mod