new version
Merge branch 'master' of https://github.com/ly772696417/2DMapEditor

Conflicts:
	2DMapEditor/CMyGame.cpp
	2DMapEditor/MapData.cpp
	2DMapEditor/MapData.h
	2DMapEditor/MapEditorController.cpp
	2DMapEditor/MotionScenery.cpp
	2DMapEditor/RightMapView.h
	2DMapEditor/Scenery.cpp
	2DMapEditor/Scenery.h
merge