Merge branch 'master' of https://scm.sourceforge.jp/gitroot/h58pcdgame/GameScriptCore...

Conflicts:
	www/corelib/header.js

diff --cc www/corelib/classes/FreeItemClass.js
Simple merge

diff --cc www/corelib/header.js
index 2b1a328,a5252b9..11f4360
--- 1/www/corelib/header.js
--- 2/www/corelib/header.js
+++ b/www/corelib/header.js
@@@ -31,7 -31,7 +31,8 @@@ document.write("<script type='text/java
  document.write("<script type='text/javascript' src='corelib/classes/EnemyCharacterClass.js'></script>");
  document.write("<script type='text/javascript' src='corelib/classes/FireObjectClass.js'></script>");
  document.write("<script type='text/javascript' src='corelib/classes/BreadItemWidgetClass.js'></script>");
 +document.write("<script type='text/javascript' src='corelib/classes/TeleportMachineClass.js'></script>");
+ document.write("<script type='text/javascript' src='corelib/classes/WarpItemClass.js'></script>");
  document.write("<script type='text/javascript' src='corelib/classes/EnemyCharacters/EnemyCharacterClass_Bear.js'></script>");
  document.write("<script type='text/javascript' src='corelib/classes/EnemyCharacters/EnemyCharacterClass_Farmer.js'></script>");
  document.write("<script type='text/javascript' src='corelib/classes/EnemyCharacters/EnemyCharacterClass_FastHotoke.js'></script>");