merge
Merge branch 'master' of https://github.com/phoenixoff/Editor

Conflicts:
	Imageff_project/bin/Debug/AppX/RemedyPic.exe
	Imageff_project/bin/Debug/AppX/RemedyPic.pdb
	Imageff_project/bin/Debug/AppX/vs.appxrecipe
	Imageff_project/bin/Debug/RemedyPic.exe
	Imageff_project/bin/Debug/RemedyPic.pdb
	Imageff_project/obj/Debug/RemedyPic.exe
	Imageff_project/obj/Debug/RemedyPic.pdb
	Imageff_project/obj/Debug/intermediatexaml/RemedyPic.exe
	Imageff_project/obj/Debug/intermediatexaml/RemedyPic.pdb
	RemedyPic.v11.suo
Merge branch 'master' of https://github.com/phoenixoff/Editor

Conflicts:
	Imageff_project/bin/Debug/AppX/RemedyPic.exe
	Imageff_project/bin/Debug/AppX/RemedyPic.pdb
	Imageff_project/bin/Debug/AppX/vs.appxrecipe
	Imageff_project/bin/Debug/RemedyPic.exe
	Imageff_project/bin/Debug/RemedyPic.pdb
	Imageff_project/obj/Debug/MainPage.g.cs
	Imageff_project/obj/Debug/MainPage.g.i.cs
	Imageff_project/obj/Debug/RemedyPic.exe
	Imageff_project/obj/Debug/RemedyPic.pdb
	Imageff_project/obj/Debug/intermediatexaml/RemedyPic.exe
	Imageff_project/obj/Debug/intermediatexaml/RemedyPic.pdb
	RemedyPic.v11.suo
Merge branch 'master' of https://github.com/phoenixoff/Editor

Conflicts:
	Imageff_project/Common/FilterFunctions.cs
	Imageff_project/bin/Debug/AppX/RemedyPic.exe
	Imageff_project/bin/Debug/AppX/RemedyPic.pdb
	Imageff_project/bin/Debug/AppX/vs.appxrecipe
	Imageff_project/bin/Debug/RemedyPic.exe
	Imageff_project/bin/Debug/RemedyPic.pdb
	Imageff_project/obj/Debug/MainPage.g.cs
	Imageff_project/obj/Debug/MainPage.g.i.cs
	Imageff_project/obj/Debug/RemedyPic.exe
	Imageff_project/obj/Debug/RemedyPic.pdb
	Imageff_project/obj/Debug/intermediatexaml/RemedyPic.exe
	Imageff_project/obj/Debug/intermediatexaml/RemedyPic.pdb
	RemedyPic.v11.suo
Added Frames