添加大地图

目前比较挫。。
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform

Conflicts:
	client/src/common/InputPanel.js.bak
	client/src/core/Hero.js
	client/src/core/Map.js
	client/src/core/Mediator.js
	client/src/core/Npc.js
	client/src/resource.js
	protected/controllers/SiteController.php

 Changes to be committed:

	modified:   client/Cocos2d-html5-v2.1.1.min.js
	modified:   client/cocos2d.js
	modified:   client/src/common/Dialog.js
	modified:   client/src/common/InputPanel.js
	modified:   client/src/config/mapConfig.js
	modified:   client/src/core/Hero.js
	modified:   client/src/core/HeroPanel.js
	modified:   client/src/core/Map.js
	modified:   client/src/core/Mediator.js
	modified:   client/src/core/Npc.js
	modified:   client/src/resource.js
	modified:   javascript/test.js
	modified:   library/yii/messages/it/zii.php
	modified:   library/yii/messages/ru/zii.php
	modified:   library/yii/messages/th/yii.php
	modified:   library/yii/messages/uk/zii.php
	modified:   library/yii/views/zh_cn/profile-callstack.php
	modified:   protected/.htaccess
	modified:   protected/config/main.php
	modified:   protected/controllers/ChatController.php
	modified:   protected/controllers/SiteController.php
	modified:   protected/controllers/TaskController.php
	modified:   protected/models/Message.php
	modified:   protected/models/Npc.php
	modified:   protected/models/Task.php
	modified:   protected/models/User.php
	modified:   protected/models/UserOnline.php
	modified:   protected/models/UserTask.php
	modified:   protected/views/task/_form.php
	modified:   protected/views/task/_search.php
	modified:   protected/views/task/_view.php
	modified:   protected/views/task/create.php
	modified:   protected/views/task/update.php

Changes not staged for commit:
	modified:   client/src/common/Dialog.js
	modified:   client/src/core/Map.js