完成npc创建功能(包含地图过滤，npcId过滤，以及地图下拉菜单)
完成了npc创建
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform

Conflicts:
	assets/4ce8decf/pager.css
	assets/5f071fa0/js/fancybox/jquery.fancybox-1.3.1.css
	assets/6006c5df/jquery.ajaxqueue.js
	assets/6006c5df/jquery.multifile.js
	assets/6006c5df/jquery.rating.js
	assets/6006c5df/jquery.treeview.async.js
	assets/6006c5df/rating/jquery.rating.css
	assets/6006c5df/treeview/jquery.treeview.css
	assets/61c4dff5/js/fancybox/jquery.fancybox-1.3.1.css
	assets/6512ff/jquery.ajaxqueue.js
	assets/6512ff/jquery.multifile.js
	assets/6512ff/jquery.rating.js
	assets/6512ff/jquery.treeview.async.js
	assets/6512ff/rating/jquery.rating.css
	assets/6512ff/treeview/jquery.treeview.css
	assets/8180540/jquery.ajaxqueue.js
	assets/8180540/jquery.multifile.js
	assets/8180540/jquery.rating.js
	assets/8180540/jquery.treeview.async.js
	assets/8180540/rating/jquery.rating.css
	assets/8180540/treeview/jquery.treeview.css
	assets/abf2aec6/jquery.ajaxqueue.js
	assets/abf2aec6/jquery.multifile.js
	assets/abf2aec6/jquery.rating.js
	assets/abf2aec6/jquery.treeview.async.js
	assets/abf2aec6/rating/jquery.rating.css
	assets/abf2aec6/treeview/jquery.treeview.css
	assets/be136aee/detailview/styles.css
	assets/be136aee/gridview/jquery.yiigridview.js
	assets/be136aee/gridview/styles.css
	assets/be136aee/listview/jquery.yiilistview.js
	assets/be136aee/listview/styles.css
	assets/e0530e41/jquery.ajaxqueue.js
	assets/e0530e41/jquery.multifile.js
	assets/e0530e41/jquery.rating.js
	assets/e0530e41/jquery.treeview.async.js
	assets/e0530e41/rating/jquery.rating.css
	assets/e0530e41/treeview/jquery.treeview.css
	assets/e1c6dc1a/jquery.ajaxqueue.js
	assets/e1c6dc1a/jquery.multifile.js
	assets/e1c6dc1a/jquery.rating.js
	assets/e1c6dc1a/jquery.treeview.async.js
	assets/e1c6dc1a/rating/jquery.rating.css
	assets/e1c6dc1a/treeview/jquery.treeview.css
	client/drawDAG.js
	client/src/common/InputPanel.js
	client/src/common/Tools.js
	client/src/core/HeroPanel.js
	client/src/core/Map.js
	client/src/core/Mediator.js
	javascript/test.js
	library/shortcut.php
	library/test.php
	protected/controllers/NpcController.php
	protected/controllers/SiteController.php
	protected/controllers/TaskController.php
	protected/models/Npc.php
	protected/views/npc/_form.php
	protected/views/npc/_search.php
	protected/views/npc/_view.php
	protected/views/npc/admin.php
	protected/views/npc/create.php
	protected/views/npc/index.php
	protected/views/npc/test.php
	protected/views/npc/update.php
	protected/views/npc/view.php
	protected/views/task/index.php
	protected/views/task/taskDraw.php