modified:   client/cocos2d.js
	modified:   client/main.js
	modified:   client/src/common/Dialog.js
	modified:   client/src/common/FriendList.js
	modified:   client/src/common/InputPanel.js
	modified:   client/src/common/TipBox.js
	modified:   client/src/common/Tools.js
	modified:   client/src/common/ViewPanel.js
	modified:   client/src/core/Hero.js
	modified:   client/src/core/Map.js
	modified:   client/src/core/Mediator.js
	modified:   client/src/core/Npc.js
	modified:   client/src/myApp.js
	modified:   client/src/resource.js
	modified:   protected/runtime/application.log

	client/res/map/map1_s.png