ノーパソをUbuntuにしたらこうなってしまった...
Merge remote-tracking branch 'MHR/master' into mozipi

Conflicts:
	lang/ja_JP.lang
	net/akaishi_teacher/mhr/HorseInfoConfig.java
	net/akaishi_teacher/mhr/HorsesControler.java
	net/akaishi_teacher/mhr/MHR.java
	net/akaishi_teacher/mhr/MHRFullTimeHealRunnable.java
	net/akaishi_teacher/mhr/MHRSetSpeedRunnable.java
	net/akaishi_teacher/mhr/commands/AllTp.java
	net/akaishi_teacher/mhr/commands/Despawn.java
	net/akaishi_teacher/mhr/commands/Help.java
	net/akaishi_teacher/mhr/commands/ReloadLangFile.java
	net/akaishi_teacher/mhr/commands/SetJump.java
	net/akaishi_teacher/mhr/commands/SetSpeed.java
	net/akaishi_teacher/mhr/commands/Spawn.java
	net/akaishi_teacher/mhr/commands/Tp.java