update
Merge branch 'UI'

Conflicts:
	kanjimusou/kanjimusou/exercise_form.Designer.cs
	kanjimusou/kanjimusou/exercise_form.resx
update