注释3
注释4
Merge remote-tracking branch 'origin/master' into mapdrag

Conflicts:solved
	src/com/nju/se/team/mota/editor/LevelEditPanel.java
	src/com/nju/se/team/mota/editor/MapPanel.java
	src/com/nju/se/team/mota/editor/uielem/MapElem.java
	src/com/nju/se/team/mota/game/unit/Unit.java