progresses,wait for merge
Merge branch 'master' of https://github.com/medivhna/Newsonmap

Conflicts:
	NOM.v12.suo
	NOM/Common/news.cs
	NOM/MainPage.xaml
	NOM/MainPage.xaml.cs
	NOM/bin/x86/Debug/AppX/MainPage.xbf
	NOM/bin/x86/Debug/AppX/vs.appxrecipe
	NOM/bin/x86/Debug/AppX/地图2.exe
	NOM/bin/x86/Debug/MainPage.xbf
	NOM/bin/x86/Debug/地图2.exe
	NOM/bin/x86/Debug/地图2.pdb
	NOM/obj/x86/Debug/MainPage.g.cs
	NOM/obj/x86/Debug/MainPage.g.i.cs
	NOM/obj/x86/Debug/MainPage.xaml
	NOM/obj/x86/Debug/MainPage.xbf
	NOM/obj/x86/Debug/XamlSaveStateFile.xml
	NOM/obj/x86/Debug/XamlTypeInfo.g.cs
	NOM/obj/x86/Debug/intermediatexaml/地图2.exe
	NOM/obj/x86/Debug/intermediatexaml/地图2.pdb
	NOM/obj/x86/Debug/地图2.exe
	NOM/obj/x86/Debug/地图2.pdb

need to merge
try