Some player sprite stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	HingaDergan.v12.suo
	HingaDergan/bin/Windows8/Debug/AppX/HingaDergan.exe
	HingaDergan/bin/Windows8/Debug/AppX/vs.appxrecipe
	HingaDergan/bin/Windows8/Debug/HingaDergan.exe
	HingaDergan/bin/Windows8/Debug/HingaDergan.pdb
	HingaDergan/obj/Debug/HingaDergan.csproj.FileListAbsolute.txt
	HingaDergan/obj/Debug/HingaDergan.exe
	HingaDergan/obj/Debug/HingaDergan.pdb
	HingaDergan/obj/Debug/SharpDX/Resources.resfiles
	HingaDergan/obj/Debug/SharpDX/Resources.resfiles.intermediate
	HingaDergan/obj/Debug/intermediatexaml/HingaDergan.exe
	HingaDergan/obj/Debug/intermediatexaml/HingaDergan.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	HingaDergan.v12.suo
	HingaDergan/bin/Windows8/Debug/AppX/HingaDergan.exe
	HingaDergan/bin/Windows8/Debug/AppX/vs.appxrecipe
	HingaDergan/bin/Windows8/Debug/HingaDergan.exe
	HingaDergan/bin/Windows8/Debug/HingaDergan.pdb
	HingaDergan/obj/Debug/HingaDergan.csproj.FileListAbsolute.txt
	HingaDergan/obj/Debug/HingaDergan.exe
	HingaDergan/obj/Debug/HingaDergan.pdb
	HingaDergan/obj/Debug/SharpDX/Resources.resfiles
	HingaDergan/obj/Debug/SharpDX/Resources.resfiles.intermediate
	HingaDergan/obj/Debug/intermediatexaml/HingaDergan.exe
	HingaDergan/obj/Debug/intermediatexaml/HingaDergan.pdb