Changed things by WebFreak001
Merge https://github.com/Naronco/Enco3D

Conflicts:
	Enco3D/Enco3D.vcxproj
	Enco3D/Enco3D/Config.h
	Library/include/SDL_events.h
	Library/lib/x86/jsoncpp.lib