bugfix
Merge branch 'master' of github.com:uphy/jijiping

Conflicts:
	android/src/main/java/jp/uphy/jijiping/JijipingService.java