Update Challenge
Fix Bug & Update Challenge
Merge remote-tracking branch 'origin/master' into KK

Conflicts:
	kanjimusou/kanjimusou_lib/user/User.cs