refs #1579
Merge branch 'ui'
refs #1580 CombineTree定義
Merge branch 'akouryy_ja'
Merge branch 'akouryy_hw'
refs #1580 fix syntax error
Merge branch 'akouryy_hw'
refs #1580 fix syntax error
Merge branch 'akouryy_hw'
refs #1580 fix bug
「解析エラー」の後に<br />追加
Merge branch 'ui'
refs #1580 fix bug
Merge branch 'master' into akouryy_ja

Conflicts:
	lib_ja.php