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

Conflicts:
	kanjimusou/kanjimusou/learn.cs
	kanjimusou/kanjimusou/learn.resx